diff --git a/spec/css/custom_properties/error.hrx b/spec/css/custom_properties/error.hrx
index d8c49373b5..014806c55f 100644
--- a/spec/css/custom_properties/error.hrx
+++ b/spec/css/custom_properties/error.hrx
@@ -55,11 +55,6 @@ Error: Custom property values may not be empty.
     baz: qux
 
 <===> nested/error
-Error: Illegal nesting: Nothing may be nested beneath custom properties.
-        on line 3 of /sass/spec/css/custom_properties/error/no_nesting/input.sass
-  Use --trace for backtrace.
-
-<===> nested/error-dart-sass
 Error: Nothing may be indented beneath a custom property.
   ,
 3 |     baz: qux
@@ -67,6 +62,11 @@ Error: Nothing may be indented beneath a custom property.
   '
   input.sass 3:5  root stylesheet
 
+<===> nested/error-libsass
+Error: Illegal nesting: Nothing may be nested beneath custom properties.
+        on line 3 of /sass/spec/css/custom_properties/error/no_nesting/input.sass
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> brackets/curly/input.scss
@@ -75,11 +75,6 @@ Error: Nothing may be indented beneath a custom property.
 }
 
 <===> brackets/curly/error
-Error: Invalid CSS after "  --prop: };": expected selector or at-rule, was "}"
-        on line 3 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly/input.scss
-  Use --trace for backtrace.
-
-<===> brackets/curly/error-dart-sass
 Error: unmatched "}".
   ,
 3 | }
@@ -87,6 +82,11 @@ Error: unmatched "}".
   '
   input.scss 3:1  root stylesheet
 
+<===> brackets/curly/error-libsass
+Error: Invalid CSS after "  --prop: };": expected selector or at-rule, was "}"
+        on line 3 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> brackets/paren/input.scss
@@ -95,11 +95,6 @@ Error: unmatched "}".
 }
 
 <===> brackets/paren/error
-Error: Invalid CSS after "  --prop: ": expected "}", was ");"
-        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/paren/input.scss
-  Use --trace for backtrace.
-
-<===> brackets/paren/error-dart-sass
 Error: expected ";".
   ,
 2 |   --prop: );
@@ -120,11 +115,6 @@ Error: Invalid CSS after "  --prop:": expected "}", was ");"
 }
 
 <===> brackets/square/error
-Error: Invalid CSS after "  --prop: ": expected "}", was "];"
-        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/square/input.scss
-  Use --trace for backtrace.
-
-<===> brackets/square/error-dart-sass
 Error: expected ";".
   ,
 2 |   --prop: ];
@@ -145,11 +135,6 @@ Error: Invalid CSS after "  --prop:": expected "}", was "];"
 }
 
 <===> brackets/curly_in_square/error
-Error: Invalid CSS after "  --prop: [{": expected "}", was "];"
-        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly_in_square/input.scss
-  Use --trace for backtrace.
-
-<===> brackets/curly_in_square/error-dart-sass
 Error: expected "}".
   ,
 2 |   --prop: [{];
@@ -157,6 +142,11 @@ Error: expected "}".
   '
   input.scss 2:13  root stylesheet
 
+<===> brackets/curly_in_square/error-libsass
+Error: Invalid CSS after "  --prop: [{": expected "}", was "];"
+        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly_in_square/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> brackets/paren_in_curly/input.scss
@@ -165,11 +155,6 @@ Error: expected "}".
 }
 
 <===> brackets/paren_in_curly/error
-Error: Invalid CSS after "  --prop: {(": expected ")", was "};"
-        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/paren_in_curly/input.scss
-  Use --trace for backtrace.
-
-<===> brackets/paren_in_curly/error-dart-sass
 Error: expected ")".
   ,
 2 |   --prop: {(};
@@ -177,6 +162,11 @@ Error: expected ")".
   '
   input.scss 2:13  root stylesheet
 
+<===> brackets/paren_in_curly/error-libsass
+Error: Invalid CSS after "  --prop: {(": expected ")", was "};"
+        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/paren_in_curly/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> brackets/square_in_paren/input.scss
@@ -185,14 +175,14 @@ Error: expected ")".
 }
 
 <===> brackets/square_in_paren/error
-Error: Invalid CSS after "  --prop: ([": expected "]", was ");"
-        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/square_in_paren/input.scss
-  Use --trace for backtrace.
-
-<===> brackets/square_in_paren/error-dart-sass
 Error: expected "]".
   ,
 2 |   --prop: ([);
   |             ^
   '
   input.scss 2:13  root stylesheet
+
+<===> brackets/square_in_paren/error-libsass
+Error: Invalid CSS after "  --prop: ([": expected "]", was ");"
+        on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/square_in_paren/input.scss
+  Use --trace for backtrace.
diff --git a/spec/css/custom_properties/trailing_whitespace.hrx b/spec/css/custom_properties/trailing_whitespace.hrx
index 33ad70323e..78d25d4d5c 100644
--- a/spec/css/custom_properties/trailing_whitespace.hrx
+++ b/spec/css/custom_properties/trailing_whitespace.hrx
@@ -8,14 +8,6 @@
 }
 
 <===> output.css
-.trailing-whitespace {
-  --space: value ;
-  --tab: value ;
-  --newline: value ;
-  --before-closing-brace: value ;
-}
-
-<===> output-dart-sass.css
 .trailing-whitespace {
   --space: value ;
   --tab: value	;
diff --git a/spec/css/unknown_directive/value_interpolation.hrx b/spec/css/unknown_directive/value_interpolation.hrx
index 0ecfa28a8e..e98ea5ae04 100644
--- a/spec/css/unknown_directive/value_interpolation.hrx
+++ b/spec/css/unknown_directive/value_interpolation.hrx
@@ -20,21 +20,21 @@
 
 <===> output.css
 @asdf 3;
-
 @asdf foobarbaz;
-
 @asdf "foo bar baz";
-
-@asdf 'foo bar baz';
-
+@asdf "foo bar baz";
 @asdf url(http://).com/);
-
 @asdf url("http://).com/");
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @asdf 3;
+
 @asdf foobarbaz;
+
 @asdf "foo bar baz";
-@asdf "foo bar baz";
+
+@asdf 'foo bar baz';
+
 @asdf url(http://).com/);
+
 @asdf url("http://).com/");
diff --git a/spec/directives/import/error/conflict.hrx b/spec/directives/import/error/conflict.hrx
index 59b9837fbe..91d71f9446 100644
--- a/spec/directives/import/error/conflict.hrx
+++ b/spec/directives/import/error/conflict.hrx
@@ -10,15 +10,6 @@ a {partial: true}
 a {partial: false}
 
 <===> partial/error
-Error: It's not clear which file to import for '@import "other"'.
-       Candidates:
-         _other.scss
-         other.scss
-       Please delete or rename all but one of these files.
-        on line 1 of /sass/spec/scss/import/partial_conflict/input.scss
-  Use --trace for backtrace.
-
-<===> partial/error-dart-sass
 Error: It's not clear which file to import. Found:
   _other.scss
   other.scss
@@ -28,6 +19,15 @@ Error: It's not clear which file to import. Found:
   '
   input.scss 3:9  root stylesheet
 
+<===> partial/error-libsass
+Error: It's not clear which file to import for '@import "other"'.
+       Candidates:
+         _other.scss
+         other.scss
+       Please delete or rename all but one of these files.
+        on line 1 of /sass/spec/scss/import/partial_conflict/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> extension/input.scss
@@ -43,15 +43,6 @@ a
 a {syntax: scss}
 
 <===> extension/error
-Error: It's not clear which file to import for '@import "other"'.
-       Candidates:
-         other.sass
-         other.scss
-       Please delete or rename all but one of these files.
-        on line 1 of /sass/spec/scss/import/extension_conflict/input.scss
-  Use --trace for backtrace.
-
-<===> extension/error-dart-sass
 Error: It's not clear which file to import. Found:
   other.sass
   other.scss
@@ -61,6 +52,15 @@ Error: It's not clear which file to import. Found:
   '
   input.scss 3:9  root stylesheet
 
+<===> extension/error-libsass
+Error: It's not clear which file to import for '@import "other"'.
+       Candidates:
+         other.sass
+         other.scss
+       Please delete or rename all but one of these files.
+        on line 1 of /sass/spec/scss/import/extension_conflict/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> all/input.scss
@@ -85,17 +85,6 @@ a
 a {syntax: scss; partial: true}
 
 <===> all/error
-Error: It's not clear which file to import for '@import "other"'.
-       Candidates:
-         _other.sass
-         other.sass
-         _other.scss
-         other.scss
-       Please delete or rename all but one of these files.
-        on line 1 of /sass/spec/scss/import/all_conflict/input.scss
-  Use --trace for backtrace.
-
-<===> all/error-dart-sass
 Error: It's not clear which file to import. Found:
   _other.sass
   other.sass
@@ -107,6 +96,17 @@ Error: It's not clear which file to import. Found:
   '
   input.scss 3:9  root stylesheet
 
+<===> all/error-libsass
+Error: It's not clear which file to import for '@import "other"'.
+       Candidates:
+         _other.sass
+         other.sass
+         _other.scss
+         other.scss
+       Please delete or rename all but one of these files.
+        on line 1 of /sass/spec/scss/import/all_conflict/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> index/input.scss
@@ -121,15 +121,6 @@ a {partial: true}
 a {partial: false}
 
 <===> index/error
-Error: It's not clear which file to import for '@import "other"'.
-       Candidates:
-         _index.scss
-         index.scss
-       Please delete or rename all but one of these files.
-        on line 1 of spec/directives/import/conflict/index/input.scss
-  Use --trace for backtrace.
-
-<===> index/error-dart-sass
 Error: It's not clear which file to import. Found:
   other/_index.scss
   other/index.scss
@@ -139,6 +130,15 @@ Error: It's not clear which file to import. Found:
   '
   input.scss 3:9  root stylesheet
 
+<===> index/error-libsass
+Error: It's not clear which file to import for '@import "other"'.
+       Candidates:
+         _index.scss
+         index.scss
+       Please delete or rename all but one of these files.
+        on line 1 of spec/directives/import/conflict/index/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> import_only/options.yml
diff --git a/spec/directives/import/error/not_found.hrx b/spec/directives/import/error/not_found.hrx
index 8533327b9c..f82cb53450 100644
--- a/spec/directives/import/error/not_found.hrx
+++ b/spec/directives/import/error/not_found.hrx
@@ -5,11 +5,6 @@
 a {b: c}
 
 <===> no_extension/error
-Error: File to import not found or unreadable: other.
-        on line 1 of /sass/spec/directives/import/no_extension/input.scss
-  Use --trace for backtrace.
-
-<===> no_extension/error-dart-sass
 Error: Can't find stylesheet to import.
   ,
 1 | @import "other";
@@ -17,6 +12,11 @@ Error: Can't find stylesheet to import.
   '
   input.scss 1:9  root stylesheet
 
+<===> no_extension/error-libsass
+Error: File to import not found or unreadable: other.
+        on line 1 of /sass/spec/directives/import/no_extension/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> directory_dot_import/input.scss
@@ -28,11 +28,6 @@ Error: Can't find stylesheet to import.
 a {b: c}
 
 <===> directory_dot_import/error
-Error: File to import not found or unreadable: other.
-        on line 1 of /sass/spec/directives/import/directory_dot_import/input.scss
-  Use --trace for backtrace.
-
-<===> directory_dot_import/error-dart-sass
 Error: Can't find stylesheet to import.
   ,
 3 | @import "other";
@@ -40,6 +35,11 @@ Error: Can't find stylesheet to import.
   '
   input.scss 3:9  root stylesheet
 
+<===> directory_dot_import/error-libsass
+Error: File to import not found or unreadable: other.
+        on line 1 of /sass/spec/directives/import/directory_dot_import/input.scss
+  Use --trace for backtrace.
+
 <===>
 ================================================================================
 <===> parent_relative/input.scss
diff --git a/spec/directives/import/load.hrx b/spec/directives/import/load.hrx
index 9aa536b93b..3176531bd2 100644
--- a/spec/directives/import/load.hrx
+++ b/spec/directives/import/load.hrx
@@ -84,12 +84,12 @@ a {
 <===> precedence/normal_before_index/input.scss
 @import "dir";
 
-<===> precedence/normal_before_index/dir/index.scss
-a {index: true}
-
 <===> precedence/normal_before_index/dir.scss
 a {index: false}
 
+<===> precedence/normal_before_index/dir/index.scss
+a {index: true}
+
 <===> precedence/normal_before_index/output.css
 a {
   index: false;
@@ -234,12 +234,12 @@ a {
 // Index files, even import-only ones, always come after non-index files.
 @import "other";
 
-<===> precedence/import_only/index_after_normal/other/index.import.scss
-a {import-only: true}
-
 <===> precedence/import_only/index_after_normal/other.scss
 a {import-only: false}
 
+<===> precedence/import_only/index_after_normal/other/index.import.scss
+a {import-only: true}
+
 <===> precedence/import_only/index_after_normal/output.css
 a {
   import-only: false;
@@ -247,14 +247,14 @@ a {
 
 <===>
 ================================================================================
+<===> index/scss/input.scss
+@import "dir";
+
 <===> index/scss/dir/index.scss
 .foo {
   a: b;
 }
 
-<===> index/scss/input.scss
-@import "dir";
-
 <===> index/scss/output.css
 .foo {
   a: b;
@@ -262,13 +262,13 @@ a {
 
 <===>
 ================================================================================
+<===> index/sass/input.scss
+@import "dir";
+
 <===> index/sass/dir/index.sass
 .foo 
   a: b
 
-<===> index/sass/input.scss
-@import "dir";
-
 <===> index/sass/output.css
 .foo {
   a: b;
@@ -276,14 +276,14 @@ a {
 
 <===>
 ================================================================================
+<===> index/partial/input.scss
+@import "dir";
+
 <===> index/partial/dir/_index.scss
 .foo {
   a: b;
 }
 
-<===> index/partial/input.scss
-@import "dir";
-
 <===> index/partial/output.css
 .foo {
   a: b;
@@ -291,14 +291,14 @@ a {
 
 <===>
 ================================================================================
+<===> index/dir_dot_foo/input.scss
+@import "dir.foo";
+
 <===> index/dir_dot_foo/dir.foo/index.scss
 .foo {
   a: b;
 }
 
-<===> index/dir_dot_foo/input.scss
-@import "dir.foo";
-
 <===> index/dir_dot_foo/output.css
 .foo {
   a: b;
@@ -306,20 +306,21 @@ a {
 
 <===>
 ================================================================================
+<===> index/dir_dot_scss/input.scss
+@import "dir.scss";
+
 <===> index/dir_dot_scss/dir.scss/index.scss
 .foo {
   a: b;
 }
 
-<===> index/dir_dot_scss/input.scss
-@import "dir.scss";
-
 <===> index/dir_dot_scss/error
-Error: File to import not found or unreadable: dir.scss.
-<===> index/dir_dot_scss/error-dart-sass
 Error: Can't find stylesheet to import.
   ,
 1 | @import "dir.scss";
   |         ^^^^^^^^^^
   '
   input.scss 1:9  root stylesheet
+
+<===> index/dir_dot_scss/error-libsass
+Error: File to import not found or unreadable: dir.scss.
\ No newline at end of file
diff --git a/spec/directives/warn/functions_in_stack.hrx b/spec/directives/warn/functions_in_stack.hrx
index 35c1fa422f..d291a91378 100644
--- a/spec/directives/warn/functions_in_stack.hrx
+++ b/spec/directives/warn/functions_in_stack.hrx
@@ -18,13 +18,13 @@
 }
 
 <===> warning
-WARNING: From function: testing
-         on line 2 of input.scss, in `issues-warning'
-         from line 7 of input.scss, in `calls-function-that-warns'
-         from line 11 of input.scss
-
-<===> warning-dart-sass
 WARNING: From function: testing
     input.scss 2:3   issues-warning()
     input.scss 7:11  calls-function-that-warns()
     input.scss 11:3  root stylesheet
+
+<===> warning-libsass
+WARNING: From function: testing
+         on line 2 of input.scss, in `issues-warning'
+         from line 7 of input.scss, in `calls-function-that-warns'
+         from line 11 of input.scss
diff --git a/spec/libsass-closed-issues/issue-2681.hrx b/spec/libsass-closed-issues/issue-2681.hrx
index 4887a8be5a..fd59c72906 100644
--- a/spec/libsass-closed-issues/issue-2681.hrx
+++ b/spec/libsass-closed-issues/issue-2681.hrx
@@ -13,17 +13,17 @@
 
 
 <===> output.css
-[type="button"] {
+[type=button] {
   color: red;
 }
-[type="button"]:focus {
+[type=button]:focus {
   color: blue;
 }
 
-<===> output-dart-sass.css
-[type=button] {
+<===> output-libsass.css
+[type="button"] {
   color: red;
 }
-[type=button]:focus {
+[type="button"]:focus {
   color: blue;
 }
diff --git a/spec/libsass-closed-issues/issue_1060.hrx b/spec/libsass-closed-issues/issue_1060.hrx
index 8ddf955d16..c51f771ab4 100644
--- a/spec/libsass-closed-issues/issue_1060.hrx
+++ b/spec/libsass-closed-issues/issue_1060.hrx
@@ -1,3 +1,7 @@
+<===> options.yml
+:warning_todo:
+  - libsass
+
 <===> input.scss
 foo {
   @if true {
@@ -23,7 +27,7 @@ foo {
   bar: true;
 }
 
-<===> warning-dart-sass
+<===> warning
 DEPRECATION WARNING on line 4, column 5 of input.scss: 
 @elseif is deprecated and will not be supported in future Sass versions.
 
diff --git a/spec/libsass-closed-issues/issue_1079.hrx b/spec/libsass-closed-issues/issue_1079.hrx
index 61310c20a1..72125730f0 100644
--- a/spec/libsass-closed-issues/issue_1079.hrx
+++ b/spec/libsass-closed-issues/issue_1079.hrx
@@ -1,12 +1,12 @@
 <===> input.scss
 #{hdr(2,5)} { color: #08c; }
 <===> error
-Error: Invalid CSS after "hdr": expected selector, was "(2, 5)"
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 1 | hdr(2, 5){ color: #08c; }
   |    ^
   '
   input.scss 1:4  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "hdr": expected selector, was "(2, 5)"
diff --git a/spec/libsass-closed-issues/issue_1082.hrx b/spec/libsass-closed-issues/issue_1082.hrx
index 04dad3c233..cb4f8beb78 100644
--- a/spec/libsass-closed-issues/issue_1082.hrx
+++ b/spec/libsass-closed-issues/issue_1082.hrx
@@ -16,15 +16,15 @@
 
 <===> output.css
 @font-face {
-  font-family: 'My Font';
+  font-family: "My Font";
   font-style: normal;
   font-weight: 300;
   src: local("My Font"), local("My-Font"), url("my-font.eot?#iefix") format("embedded-opentype"), url("my-font.woff") format("woff"), url("my-font.ttf") format("truetype"), url("my-font.svg#MyFont") format("svg");
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @font-face {
-  font-family: "My Font";
+  font-family: 'My Font';
   font-style: normal;
   font-weight: 300;
   src: local("My Font"), local("My-Font"), url("my-font.eot?#iefix") format("embedded-opentype"), url("my-font.woff") format("woff"), url("my-font.ttf") format("truetype"), url("my-font.svg#MyFont") format("svg");
diff --git a/spec/libsass-closed-issues/issue_1092.hrx b/spec/libsass-closed-issues/issue_1092.hrx
index ce4d1f2f1f..a80b6c43ef 100644
--- a/spec/libsass-closed-issues/issue_1092.hrx
+++ b/spec/libsass-closed-issues/issue_1092.hrx
@@ -8,7 +8,7 @@ d { d: foo #{$baz}; }
 
 <===> output.css
 a {
-  a: foo ;
+  a: foo;
 }
 
 b {
@@ -16,16 +16,16 @@ b {
 }
 
 c {
-  c: foo ;
+  c: foo;
 }
 
 d {
   d: foo  ;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 a {
-  a: foo;
+  a: foo ;
 }
 
 b {
@@ -33,7 +33,7 @@ b {
 }
 
 c {
-  c: foo;
+  c: foo ;
 }
 
 d {
diff --git a/spec/libsass-closed-issues/issue_1093/argument/function.hrx b/spec/libsass-closed-issues/issue_1093/argument/function.hrx
index a27faa533d..a151e0d56c 100644
--- a/spec/libsass-closed-issues/issue_1093/argument/function.hrx
+++ b/spec/libsass-closed-issues/issue_1093/argument/function.hrx
@@ -11,12 +11,12 @@
 $foo: foo();
 
 <===> error
-Error: Invalid CSS after "...ion foo($bar:#{": expected expression (e.g. 1px, bold), was "}) {"
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @function foo($bar:#{}) {
   |                    ^^
   '
   input.scss 1:20  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...ion foo($bar:#{": expected expression (e.g. 1px, bold), was "}) {"
diff --git a/spec/libsass-closed-issues/issue_1093/argument/mixin.hrx b/spec/libsass-closed-issues/issue_1093/argument/mixin.hrx
index 3a1d9e3b94..acd119727e 100644
--- a/spec/libsass-closed-issues/issue_1093/argument/mixin.hrx
+++ b/spec/libsass-closed-issues/issue_1093/argument/mixin.hrx
@@ -13,12 +13,12 @@ foo {
 }
 
 <===> error
-Error: Invalid CSS after "@mixin foo($bar:#{": expected expression (e.g. 1px, bold), was "}) {"
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @mixin foo($bar:#{}) {
   |                 ^^
   '
   input.scss 1:17  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@mixin foo($bar:#{": expected expression (e.g. 1px, bold), was "}) {"
diff --git a/spec/libsass-closed-issues/issue_1093/assignment.hrx b/spec/libsass-closed-issues/issue_1093/assignment.hrx
index d64fa7c6f8..f297ef8919 100644
--- a/spec/libsass-closed-issues/issue_1093/assignment.hrx
+++ b/spec/libsass-closed-issues/issue_1093/assignment.hrx
@@ -2,14 +2,14 @@
 $foo: #{};
 
 <===> error
-Error: Invalid CSS after "$foo: #{": expected expression (e.g. 1px, bold), was "};"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | $foo: #{};
   |       ^^
   '
   input.scss 1:7  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "$foo: #{": expected expression (e.g. 1px, bold), was "};"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1093/parameter/function.hrx b/spec/libsass-closed-issues/issue_1093/parameter/function.hrx
index dc5d00fbe9..89997fa27b 100644
--- a/spec/libsass-closed-issues/issue_1093/parameter/function.hrx
+++ b/spec/libsass-closed-issues/issue_1093/parameter/function.hrx
@@ -6,14 +6,14 @@
 $foo: foo(#{});
 
 <===> error
-Error: Invalid CSS after "$foo: foo(#{": expected expression (e.g. 1px, bold), was "});"
-        on line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 5 | $foo: foo(#{});
   |           ^^
   '
   input.scss 5:11  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "$foo: foo(#{": expected expression (e.g. 1px, bold), was "});"
+        on line 5 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1093/parameter/mixin.hrx b/spec/libsass-closed-issues/issue_1093/parameter/mixin.hrx
index 501ff264fb..c95c6a8cb6 100644
--- a/spec/libsass-closed-issues/issue_1093/parameter/mixin.hrx
+++ b/spec/libsass-closed-issues/issue_1093/parameter/mixin.hrx
@@ -8,14 +8,14 @@ foo {
 }
 
 <===> error
-Error: Invalid CSS after "  @include foo(#{": expected expression (e.g. 1px, bold), was "});"
-        on line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 6 |   @include foo(#{});
   |                ^^
   '
   input.scss 6:16  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "  @include foo(#{": expected expression (e.g. 1px, bold), was "});"
+        on line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1093/property.hrx b/spec/libsass-closed-issues/issue_1093/property.hrx
index 74ed30c7ec..33a82925df 100644
--- a/spec/libsass-closed-issues/issue_1093/property.hrx
+++ b/spec/libsass-closed-issues/issue_1093/property.hrx
@@ -4,14 +4,14 @@ foo {
 }
 
 <===> error
-Error: Invalid CSS after "  bar: #{": expected expression (e.g. 1px, bold), was "};"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 2 |   bar: #{};
   |        ^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "  bar: #{": expected expression (e.g. 1px, bold), was "};"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1106.hrx b/spec/libsass-closed-issues/issue_1106.hrx
index 38ae277838..b60ddcf080 100644
--- a/spec/libsass-closed-issues/issue_1106.hrx
+++ b/spec/libsass-closed-issues/issue_1106.hrx
@@ -14,15 +14,7 @@ b {
     unquote: unquote($foo);
 }
 
-<===> error-dart-sass
-Error: $string: null is not a string.
-  ,
-7 |     unquote: unquote($foo);
-  |              ^^^^^^^^^^^^^
-  '
-  input.scss 7:14  root stylesheet
-
-<===> output.css
+<===> output-libsass.css
 a {
   foo: bar;
 }
@@ -34,3 +26,11 @@ will be an error in future versions of Sass.
 DEPRECATION WARNING: Passing null, a non-string value, to unquote()
 will be an error in future versions of Sass.
         on line 13 of input.scss
+
+<===> error
+Error: $string: null is not a string.
+  ,
+7 |     unquote: unquote($foo);
+  |              ^^^^^^^^^^^^^
+  '
+  input.scss 7:14  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_1107.hrx b/spec/libsass-closed-issues/issue_1107.hrx
index 1ed0cfcf3d..fb5d98c446 100644
--- a/spec/libsass-closed-issues/issue_1107.hrx
+++ b/spec/libsass-closed-issues/issue_1107.hrx
@@ -7,10 +7,10 @@
 
 <===> output.css
 .foo {
-  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader( src="foo", sizingMethod='scale');
+  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader( src="foo", sizingMethod="scale");
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .foo {
-  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader( src="foo", sizingMethod="scale");
+  filter: progid:DXImageTransform.Microsoft.AlphaImageLoader( src="foo", sizingMethod='scale');
 }
diff --git a/spec/libsass-closed-issues/issue_1115.hrx b/spec/libsass-closed-issues/issue_1115.hrx
index 459b35c229..05bda94f9b 100644
--- a/spec/libsass-closed-issues/issue_1115.hrx
+++ b/spec/libsass-closed-issues/issue_1115.hrx
@@ -8,15 +8,15 @@ foo {
 
 <===> output.css
 foo {
-  bar: "x\79";
+  bar: "xy";
   baz: "xy";
   bar: "x\a";
   baz: "x\a";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
-  bar: "xy";
+  bar: "x\79";
   baz: "xy";
   bar: "x\a";
   baz: "x\a";
diff --git a/spec/libsass-closed-issues/issue_1169/error/color.hrx b/spec/libsass-closed-issues/issue_1169/error/color.hrx
index 25c77901ad..b0f8b50f64 100644
--- a/spec/libsass-closed-issues/issue_1169/error/color.hrx
+++ b/spec/libsass-closed-issues/issue_1169/error/color.hrx
@@ -8,11 +8,6 @@ $map: (
   content: inspect($map);
 }
 <===> error
-Error: Duplicate key #ff0000 in map (red: "foo", red: "bar").
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Duplicate key.
   ,
 2 |   red: 'foo',
diff --git a/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx b/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx
index a7da782d0b..c1b04c9b40 100644
--- a/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx
+++ b/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx
@@ -12,11 +12,6 @@ $map: (
   content: inspect($map);
 }
 <===> error
-Error: Duplicate key "key" in map (fncall(1 + 2): "foo", fncall(1 + 2): "bar").
-        on line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Duplicate key.
   ,
 6 |   fncall(1+2): 'foo',
@@ -25,3 +20,8 @@ Error: Duplicate key.
   |   ^^^^^^^^^^^ second key
   '
   input.scss 7:3  root stylesheet
+
+<===> error-libsass
+Error: Duplicate key "key" in map (fncall(1 + 2): "foo", fncall(1 + 2): "bar").
+        on line 5 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx b/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx
index 7c4b6a7511..2d6ba1dc95 100644
--- a/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx
+++ b/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx
@@ -8,11 +8,6 @@ $map: (
   content: inspect($map);
 }
 <===> error
-Error: Duplicate key "red" in map ("red": "bar", #{re}#{"d"}: "baz").
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Duplicate key.
   ,
 2 |   'red': 'bar',
@@ -21,3 +16,8 @@ Error: Duplicate key.
   |   ^^^^^^^^^^^ second key
   '
   input.scss 3:3  root stylesheet
+
+<===> error-libsass
+Error: Duplicate key "red" in map ("red": "bar", #{re}#{"d"}: "baz").
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1187.hrx b/spec/libsass-closed-issues/issue_1187.hrx
index 02ee5c4707..a6aeb33154 100644
--- a/spec/libsass-closed-issues/issue_1187.hrx
+++ b/spec/libsass-closed-issues/issue_1187.hrx
@@ -11,11 +11,6 @@ $map: (
   content: inspect($map);
 }
 <===> error
-Error: Duplicate key "foo" in map ($a: 1, $b: 2).
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Duplicate key.
   ,
 4 |   $a: 1,
@@ -24,3 +19,8 @@ Error: Duplicate key.
   |   ^^ second key
   '
   input.scss 5:3  root stylesheet
+
+<===> error-libsass
+Error: Duplicate key "foo" in map ($a: 1, $b: 2).
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1188.hrx b/spec/libsass-closed-issues/issue_1188.hrx
index 7f4c35b0d0..b93b68fa3f 100644
--- a/spec/libsass-closed-issues/issue_1188.hrx
+++ b/spec/libsass-closed-issues/issue_1188.hrx
@@ -12,12 +12,12 @@ foo {
 }
 <===> output.css
 foo {
-  *width: expression((this.parentNode.clientWidth/120px*2 - parseInt(this.currentStyle['paddingLeft']) - parseInt(this.currentStyle['paddingRight'])) + 'px');
+  *width: expression((this.parentNode.clientWidth/120px*2 - parseInt(this.currentStyle["paddingLeft"]) - parseInt(this.currentStyle["paddingRight"])) + "px");
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
-  *width: expression((this.parentNode.clientWidth/120px*2 - parseInt(this.currentStyle["paddingLeft"]) - parseInt(this.currentStyle["paddingRight"])) + "px");
+  *width: expression((this.parentNode.clientWidth/120px*2 - parseInt(this.currentStyle['paddingLeft']) - parseInt(this.currentStyle['paddingRight'])) + 'px');
 }
 
 <===> warning
diff --git a/spec/libsass-closed-issues/issue_1215.hrx b/spec/libsass-closed-issues/issue_1215.hrx
index 6235187063..1a89599be7 100644
--- a/spec/libsass-closed-issues/issue_1215.hrx
+++ b/spec/libsass-closed-issues/issue_1215.hrx
@@ -20,13 +20,13 @@ foo {
   -quotes: false;
   -quotes: false;
   foo: this-string;
-  foo: 'this-string';
+  foo: "this-string";
   foo: "this-string";
   foo: '"this-string"';
   foo: "'this-string'";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   -quotes: true;
   -quotes: true;
@@ -34,7 +34,7 @@ foo {
   -quotes: false;
   -quotes: false;
   foo: this-string;
-  foo: "this-string";
+  foo: 'this-string';
   foo: "this-string";
   foo: '"this-string"';
   foo: "'this-string'";
diff --git a/spec/libsass-closed-issues/issue_1216.hrx b/spec/libsass-closed-issues/issue_1216.hrx
index 68a6cf7c4e..8d499d7ddb 100644
--- a/spec/libsass-closed-issues/issue_1216.hrx
+++ b/spec/libsass-closed-issues/issue_1216.hrx
@@ -6,15 +6,15 @@ a {
 }
 
 <===> output.css
-a {
-  width: 4.0px;
-  height: 3.00px;
-  opacity: 1.0;
-}
-
-<===> output-dart-sass.css
 a {
   width: 4px;
   height: 3px;
   opacity: 1;
 }
+
+<===> output-libsass.css
+a {
+  width: 4.0px;
+  height: 3.00px;
+  opacity: 1.0;
+}
diff --git a/spec/libsass-closed-issues/issue_1257.hrx b/spec/libsass-closed-issues/issue_1257.hrx
index 7bb251f5ff..5e3763cdc8 100644
--- a/spec/libsass-closed-issues/issue_1257.hrx
+++ b/spec/libsass-closed-issues/issue_1257.hrx
@@ -4,10 +4,10 @@
 }
 <===> output.css
 .foo {
-  color: cyan;
+  color: aqua;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .foo {
-  color: aqua;
+  color: cyan;
 }
diff --git a/spec/libsass-closed-issues/issue_1328.hrx b/spec/libsass-closed-issues/issue_1328.hrx
index b9fe889c69..7205b928c7 100644
--- a/spec/libsass-closed-issues/issue_1328.hrx
+++ b/spec/libsass-closed-issues/issue_1328.hrx
@@ -7,14 +7,14 @@
 
 <===> output.css
 bar,
-[foo="bar"],
-[foo="bar"] {
+[foo=bar],
+[foo=bar] {
   content: "foo";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 bar,
-[foo=bar],
-[foo=bar] {
+[foo="bar"],
+[foo="bar"] {
   content: "foo";
 }
diff --git a/spec/libsass-closed-issues/issue_1355.hrx b/spec/libsass-closed-issues/issue_1355.hrx
index 7024101957..e8e8dbf53c 100644
--- a/spec/libsass-closed-issues/issue_1355.hrx
+++ b/spec/libsass-closed-issues/issue_1355.hrx
@@ -7,14 +7,14 @@ div {
   x: type-of(test());
 }
 <===> error
-Error: Invalid CSS after "  @return": expected expression (e.g. 1px, bold), was ";"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 2 |   @return;
   |          ^
   '
   input.scss 2:10  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "  @return": expected expression (e.g. 1px, bold), was ";"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1399.hrx b/spec/libsass-closed-issues/issue_1399.hrx
index fec529d3f9..6aed07b24f 100644
--- a/spec/libsass-closed-issues/issue_1399.hrx
+++ b/spec/libsass-closed-issues/issue_1399.hrx
@@ -10,14 +10,14 @@ foo {
 foo {
   foo: 3-"bar";
   foo: 3-"bar";
-  foo: 3 / "bar";
+  foo: 3/"bar";
   foo: 3/"bar";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   foo: 3-"bar";
   foo: 3-"bar";
-  foo: 3/"bar";
+  foo: 3 / "bar";
   foo: 3/"bar";
 }
diff --git a/spec/libsass-closed-issues/issue_1418/static.hrx b/spec/libsass-closed-issues/issue_1418/static.hrx
index a1bc1b9bb4..f7f7fd2138 100644
--- a/spec/libsass-closed-issues/issue_1418/static.hrx
+++ b/spec/libsass-closed-issues/issue_1418/static.hrx
@@ -4,14 +4,14 @@ foo {
 }
 
 <===> error
-Error: Plain CSS function missing doesn't support keyword arguments
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Plain CSS functions don't support keyword arguments.
   ,
 2 |     color: missing($a: b);
   |            ^^^^^^^^^^^^^^
   '
   input.scss 2:12  root stylesheet
+
+<===> error-libsass
+Error: Plain CSS function missing doesn't support keyword arguments
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1432/selector-extend.hrx b/spec/libsass-closed-issues/issue_1432/selector-extend.hrx
index 8b3353b87f..89b83feed8 100644
--- a/spec/libsass-closed-issues/issue_1432/selector-extend.hrx
+++ b/spec/libsass-closed-issues/issue_1432/selector-extend.hrx
@@ -2,12 +2,6 @@
 @debug(selector-extend(".a .b", ".b", null));
 
 <===> error
-Error: $extender: null is not a valid selector: it must be a string,
-       a list of strings, or a list of lists of strings for `selector-extend'
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: $extender: null is not a valid selector: it must be a string,
 a list of strings, or a list of lists of strings.
   ,
@@ -15,3 +9,9 @@ a list of strings, or a list of lists of strings.
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: $extender: null is not a valid selector: it must be a string,
+       a list of strings, or a list of lists of strings for `selector-extend'
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1432/selector-nest.hrx b/spec/libsass-closed-issues/issue_1432/selector-nest.hrx
index a45ec8f52f..6f2cf586e9 100644
--- a/spec/libsass-closed-issues/issue_1432/selector-nest.hrx
+++ b/spec/libsass-closed-issues/issue_1432/selector-nest.hrx
@@ -2,12 +2,6 @@
 @debug(selector-nest("foo", null));
 
 <===> error
-Error: $selectors: null is not a valid selector: it must be a string,
-       a list of strings, or a list of lists of strings for `selector-nest'
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: null is not a valid selector: it must be a string,
 a list of strings, or a list of lists of strings.
   ,
@@ -15,3 +9,9 @@ a list of strings, or a list of lists of strings.
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: $selectors: null is not a valid selector: it must be a string,
+       a list of strings, or a list of lists of strings for `selector-nest'
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1432/selector-replace.hrx b/spec/libsass-closed-issues/issue_1432/selector-replace.hrx
index e04f7151d4..86ceda7a40 100644
--- a/spec/libsass-closed-issues/issue_1432/selector-replace.hrx
+++ b/spec/libsass-closed-issues/issue_1432/selector-replace.hrx
@@ -2,12 +2,6 @@
 @debug(selector-replace("foo", "bar", null));
 
 <===> error
-Error: $replacement: null is not a valid selector: it must be a string,
-       a list of strings, or a list of lists of strings for `selector-replace'
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: $replacement: null is not a valid selector: it must be a string,
 a list of strings, or a list of lists of strings.
   ,
@@ -15,3 +9,9 @@ a list of strings, or a list of lists of strings.
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: $replacement: null is not a valid selector: it must be a string,
+       a list of strings, or a list of lists of strings for `selector-replace'
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1432/selector-unify.hrx b/spec/libsass-closed-issues/issue_1432/selector-unify.hrx
index a38504b4d5..32f00ceec5 100644
--- a/spec/libsass-closed-issues/issue_1432/selector-unify.hrx
+++ b/spec/libsass-closed-issues/issue_1432/selector-unify.hrx
@@ -2,12 +2,6 @@
 @debug(selector-unify("foo", null));
 
 <===> error
-Error: $selector2: null is not a valid selector: it must be a string,
-       a list of strings, or a list of lists of strings for `selector-unify'
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: $selector2: null is not a valid selector: it must be a string,
 a list of strings, or a list of lists of strings.
   ,
@@ -15,3 +9,9 @@ a list of strings, or a list of lists of strings.
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: $selector2: null is not a valid selector: it must be a string,
+       a list of strings, or a list of lists of strings for `selector-unify'
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx b/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx
index 88a7e897b5..66bfd4ef3f 100644
--- a/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx
+++ b/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx
@@ -2,11 +2,6 @@
 @debug(simple-selectors(null));
 
 <===> error
-Error: $selector: null is not a string for `simple-selectors'
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: $selector: null is not a valid selector: it must be a string,
 a list of strings, or a list of lists of strings.
   ,
@@ -14,3 +9,8 @@ a list of strings, or a list of lists of strings.
   |        ^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: $selector: null is not a string for `simple-selectors'
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1452.hrx b/spec/libsass-closed-issues/issue_1452.hrx
index e03d9d343d..a25ad7d47a 100644
--- a/spec/libsass-closed-issues/issue_1452.hrx
+++ b/spec/libsass-closed-issues/issue_1452.hrx
@@ -4,14 +4,14 @@ foo {
 }
 
 <===> error
-Error: () isn't a valid CSS value.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: () isn't a valid CSS value.
   ,
 2 |   foo: foo(());
   |            ^^
   '
   input.scss 2:12  root stylesheet
+
+<===> error-libsass
+Error: () isn't a valid CSS value.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1484.hrx b/spec/libsass-closed-issues/issue_1484.hrx
index b365948547..51f210bc5a 100644
--- a/spec/libsass-closed-issues/issue_1484.hrx
+++ b/spec/libsass-closed-issues/issue_1484.hrx
@@ -2,14 +2,14 @@
 div {
 
 <===> error
-Error: Invalid CSS after "div {": expected "}", was ""
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "}".
   ,
 1 | div {
   |      ^
   '
   input.scss 1:6  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "div {": expected "}", was ""
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1487.hrx b/spec/libsass-closed-issues/issue_1487.hrx
index 8380a4fa0f..49363d2c57 100644
--- a/spec/libsass-closed-issues/issue_1487.hrx
+++ b/spec/libsass-closed-issues/issue_1487.hrx
@@ -8,12 +8,6 @@ foo {
 }
 
 <===> error
-Error: Mixin "foo" does not accept a content block.
-        on line 6 of input.scss, in `foo'
-        from line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixin doesn't accept a content block.
     ,
 1   | @mixin foo() {
@@ -23,3 +17,9 @@ Error: Mixin doesn't accept a content block.
     |   ^^^^^^^^^^^^ invocation
     '
   input.scss 6:3  root stylesheet
+
+<===> error-libsass
+Error: Mixin "foo" does not accept a content block.
+        on line 6 of input.scss, in `foo'
+        from line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_152.hrx b/spec/libsass-closed-issues/issue_152.hrx
index ccfa6612fa..3293a593ac 100644
--- a/spec/libsass-closed-issues/issue_152.hrx
+++ b/spec/libsass-closed-issues/issue_152.hrx
@@ -23,12 +23,12 @@ foo {
 }
 
 <===> error
-Error: Undefined operation: "10 mod 100%".
-
-<===> error-dart-sass
 Error: Undefined operation "10 % 100%".
   ,
 5 |   a: #{10}% 100%;
   |      ^^^^^^^^^^^
   '
   input.scss 5:6  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "10 mod 100%".
diff --git a/spec/libsass-closed-issues/issue_1527/extend.hrx b/spec/libsass-closed-issues/issue_1527/extend.hrx
index 97facac13e..f6cbb0bc2b 100644
--- a/spec/libsass-closed-issues/issue_1527/extend.hrx
+++ b/spec/libsass-closed-issues/issue_1527/extend.hrx
@@ -4,20 +4,15 @@ foo {
 }
 
 <===> error
-Error: Can't extend &: can't extend parent selectors
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Parent selectors aren't allowed here.
-        on line 2:11 of input.scss
->>   @extend &;
-   ----------^
-
-<===> error-dart-sass
 Error: Parent selectors aren't allowed here.
   ,
 2 |   @extend &;
   |           ^
   '
   input.scss 2:11  root stylesheet
+
+<===> error-libsass
+Error: Parent selectors aren't allowed here.
+        on line 2:11 of input.scss
+>>   @extend &;
+   ----------^
diff --git a/spec/libsass-closed-issues/issue_1527/selector/first.hrx b/spec/libsass-closed-issues/issue_1527/selector/first.hrx
index 5a0af0382f..d6ad0f363d 100644
--- a/spec/libsass-closed-issues/issue_1527/selector/first.hrx
+++ b/spec/libsass-closed-issues/issue_1527/selector/first.hrx
@@ -4,19 +4,14 @@
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1 of input.scss
->> & foo {
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | & foo {
   | ^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1 of input.scss
+>> & foo {
diff --git a/spec/libsass-closed-issues/issue_1527/selector/last.hrx b/spec/libsass-closed-issues/issue_1527/selector/last.hrx
index f310dad790..f2b50c5e09 100644
--- a/spec/libsass-closed-issues/issue_1527/selector/last.hrx
+++ b/spec/libsass-closed-issues/issue_1527/selector/last.hrx
@@ -4,19 +4,14 @@ foo & {
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1 of input.scss
->> foo & {
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | foo & {
   | ^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1 of input.scss
+>> foo & {
diff --git a/spec/libsass-closed-issues/issue_1527/selector/only.hrx b/spec/libsass-closed-issues/issue_1527/selector/only.hrx
index f84fc20180..b620ffd119 100644
--- a/spec/libsass-closed-issues/issue_1527/selector/only.hrx
+++ b/spec/libsass-closed-issues/issue_1527/selector/only.hrx
@@ -2,19 +2,14 @@
 & {}
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1 of input.scss
->> & {}
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | & {}
   | ^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1 of input.scss
+>> & {}
diff --git a/spec/libsass-closed-issues/issue_1537.hrx b/spec/libsass-closed-issues/issue_1537.hrx
index 9c0dd30379..1534fb815e 100644
--- a/spec/libsass-closed-issues/issue_1537.hrx
+++ b/spec/libsass-closed-issues/issue_1537.hrx
@@ -12,14 +12,14 @@ test {
 }
 
 <===> error
-Error: Invalid CSS after "  a: 1, two": expected ":", was ", 3,"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ":".
   ,
 2 |   a: 1, two, 3,
   |            ^
   '
   input.scss 2:12  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "  a: 1, two": expected ":", was ", 3,"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1550/each_embedded.hrx b/spec/libsass-closed-issues/issue_1550/each_embedded.hrx
index b51eeeaf12..56debae581 100644
--- a/spec/libsass-closed-issues/issue_1550/each_embedded.hrx
+++ b/spec/libsass-closed-issues/issue_1550/each_embedded.hrx
@@ -6,14 +6,14 @@
 }
 
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1550/for_embedded.hrx b/spec/libsass-closed-issues/issue_1550/for_embedded.hrx
index 5aa3fbb4cc..001c3d9dcb 100644
--- a/spec/libsass-closed-issues/issue_1550/for_embedded.hrx
+++ b/spec/libsass-closed-issues/issue_1550/for_embedded.hrx
@@ -6,14 +6,14 @@
 }
 
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1550/if_embedded.hrx b/spec/libsass-closed-issues/issue_1550/if_embedded.hrx
index 9acf74775e..42c8ed48e1 100644
--- a/spec/libsass-closed-issues/issue_1550/if_embedded.hrx
+++ b/spec/libsass-closed-issues/issue_1550/if_embedded.hrx
@@ -6,14 +6,14 @@
 }
 
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1550/mixin_embedded.hrx b/spec/libsass-closed-issues/issue_1550/mixin_embedded.hrx
index e70d6d511f..3f820cb503 100644
--- a/spec/libsass-closed-issues/issue_1550/mixin_embedded.hrx
+++ b/spec/libsass-closed-issues/issue_1550/mixin_embedded.hrx
@@ -6,14 +6,14 @@
 }
 
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not contain function declarations.
   ,
 2 |   @function foo() {
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1550/while_embedded.hrx b/spec/libsass-closed-issues/issue_1550/while_embedded.hrx
index f4c206877b..f7a6f0ff83 100644
--- a/spec/libsass-closed-issues/issue_1550/while_embedded.hrx
+++ b/spec/libsass-closed-issues/issue_1550/while_embedded.hrx
@@ -8,14 +8,14 @@ $i: 1;
 }
 
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 3 |   @function foo() {
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 3:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1569.hrx b/spec/libsass-closed-issues/issue_1569.hrx
index b67b90955b..3b3c2ac052 100644
--- a/spec/libsass-closed-issues/issue_1569.hrx
+++ b/spec/libsass-closed-issues/issue_1569.hrx
@@ -10,20 +10,15 @@ $common-border: "foo";
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 2 of input.scss
->> .nihilo & {
-   ^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 2 | .nihilo & {
   | ^^^^^^^^^^
   '
   input.scss 2:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 2 of input.scss
+>> .nihilo & {
+   ^
diff --git a/spec/libsass-closed-issues/issue_1574.hrx b/spec/libsass-closed-issues/issue_1574.hrx
index 0ab6becde0..07fed6f20b 100644
--- a/spec/libsass-closed-issues/issue_1574.hrx
+++ b/spec/libsass-closed-issues/issue_1574.hrx
@@ -17,20 +17,6 @@ textarea {
 }
 
 <===> output.css
-.foo, input[type="text"],
-input[type="search"],
-input[type="url"],
-input[type="email"],
-input[type="password"],
-input[type="number"],
-input[type="tel"],
-input[type="date"],
-input[type="range"],
-textarea {
-  bar: baz;
-}
-
-<===> output-dart-sass.css
 .foo, input[type=text],
 input[type=search],
 input[type=url],
@@ -43,3 +29,17 @@ input[type=range],
 textarea {
   bar: baz;
 }
+
+<===> output-libsass.css
+.foo, input[type="text"],
+input[type="search"],
+input[type="url"],
+input[type="email"],
+input[type="password"],
+input[type="number"],
+input[type="tel"],
+input[type="date"],
+input[type="range"],
+textarea {
+  bar: baz;
+}
diff --git a/spec/libsass-closed-issues/issue_1578.hrx b/spec/libsass-closed-issues/issue_1578.hrx
index b014871aac..dc47c64195 100644
--- a/spec/libsass-closed-issues/issue_1578.hrx
+++ b/spec/libsass-closed-issues/issue_1578.hrx
@@ -15,10 +15,6 @@ foo {
 }
 
 <===> warning
-WARNING on line 4 of input.sass:
-This selector doesn't have any properties and will not be rendered.
-
-<===> warning-dart-sass
 WARNING on line 4, column 5 of input.sass: 
 This selector doesn't have any properties and won't be rendered.
   ,
diff --git a/spec/libsass-closed-issues/issue_1585.hrx b/spec/libsass-closed-issues/issue_1585.hrx
index 51ec5ce3c1..603b8a5205 100644
--- a/spec/libsass-closed-issues/issue_1585.hrx
+++ b/spec/libsass-closed-issues/issue_1585.hrx
@@ -13,11 +13,6 @@
 }
 
 <===> error
-Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
-        on line 7 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Declarations may only be used within style rules.
   ,
 7 |     color: yellow;
@@ -26,3 +21,8 @@ Error: Declarations may only be used within style rules.
   input.scss 7:5   @content
   input.scss 2:14  bar()
   input.scss 6:3   root stylesheet
+
+<===> error-libsass
+Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
+        on line 7 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1601.hrx b/spec/libsass-closed-issues/issue_1601.hrx
index 9cbff51a03..77cb2efe4e 100644
--- a/spec/libsass-closed-issues/issue_1601.hrx
+++ b/spec/libsass-closed-issues/issue_1601.hrx
@@ -5,14 +5,14 @@
     }
 }
 <===> error
-Error: Invalid parent selector for "&.ruby": ".code.ruby >"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Parent ".code.ruby >" is incompatible with this selector.
   ,
 2 |     &.ruby {
   |     ^^^^^^^
   '
   input.scss 2:5  root stylesheet
+
+<===> error-libsass
+Error: Invalid parent selector for "&.ruby": ".code.ruby >"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1644/complex.hrx b/spec/libsass-closed-issues/issue_1644/complex.hrx
index cfe18ed0c1..3e05b51319 100644
--- a/spec/libsass-closed-issues/issue_1644/complex.hrx
+++ b/spec/libsass-closed-issues/issue_1644/complex.hrx
@@ -35,21 +35,6 @@ $grid-breakpoints-immobile: (
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 30 of input.scss, in `@content'
-        from line 22 of input.scss, in `grid-media-query'
-        from line 29 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 22:9 of input.scss, in mixin `grid-media-query`
-        from line 29:12 of input.scss
->>     body.immobile & {
-
-   ----^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
    ,
 30 |     body.immobile & {
@@ -58,3 +43,11 @@ Error: Top-level selectors may not contain the parent selector "&".
   input.scss 30:5  @content
   input.scss 22:9  grid-media-query()
   input.scss 29:3  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 22:9 of input.scss, in mixin `grid-media-query`
+        from line 29:12 of input.scss
+>>     body.immobile & {
+
+   ----^
diff --git a/spec/libsass-closed-issues/issue_1644/mixin-parent.hrx b/spec/libsass-closed-issues/issue_1644/mixin-parent.hrx
index 5b9fa1d989..3ab059dfec 100644
--- a/spec/libsass-closed-issues/issue_1644/mixin-parent.hrx
+++ b/spec/libsass-closed-issues/issue_1644/mixin-parent.hrx
@@ -10,20 +10,6 @@
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 6 of input.scss, in `@content'
-        from line 2 of input.scss, in `parent'
-        from line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 2:5 of input.scss, in mixin `parent`
-        from line 5:12 of input.scss
->>     body.immobile & {
-   ----^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 6 |   body.immobile & {
@@ -32,3 +18,10 @@ Error: Top-level selectors may not contain the parent selector "&".
   input.scss 6:3  @content
   input.scss 2:3  parent()
   input.scss 5:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 2:5 of input.scss, in mixin `parent`
+        from line 5:12 of input.scss
+>>     body.immobile & {
+   ----^
diff --git a/spec/libsass-closed-issues/issue_1648.hrx b/spec/libsass-closed-issues/issue_1648.hrx
index 9ce4ea5b19..03838f27e6 100644
--- a/spec/libsass-closed-issues/issue_1648.hrx
+++ b/spec/libsass-closed-issues/issue_1648.hrx
@@ -1,3 +1,7 @@
+<===> options.yml
+:warning_todo:
+  - libsass
+
 <===> input.scss
 $x: 3px;
 /* comment 1 */
@@ -22,7 +26,7 @@ $x: 3px;
 /* if 1 */
 /* comment 5 */
 
-<===> warning-dart-sass
+<===> warning
 DEPRECATION WARNING on line 7, column 1 of input.scss: 
 @elseif is deprecated and will not be supported in future Sass versions.
 
diff --git a/spec/libsass-closed-issues/issue_1651/with.hrx b/spec/libsass-closed-issues/issue_1651/with.hrx
index f8fb077754..0fe7ea040b 100644
--- a/spec/libsass-closed-issues/issue_1651/with.hrx
+++ b/spec/libsass-closed-issues/issue_1651/with.hrx
@@ -9,14 +9,14 @@ a {
 } 
 
 <===> error
-Error: Extend directives may only be used within rules.
-        on line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: @extend may only be used within style rules.
   ,
 6 |     @extend .a;
   |     ^^^^^^^^^^
   '
   input.scss 6:5  root stylesheet
+
+<===> error-libsass
+Error: Extend directives may only be used within rules.
+        on line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1658.hrx b/spec/libsass-closed-issues/issue_1658.hrx
index 457b560349..820ff27044 100644
--- a/spec/libsass-closed-issues/issue_1658.hrx
+++ b/spec/libsass-closed-issues/issue_1658.hrx
@@ -2,14 +2,14 @@
 @else{}
 
 <===> error
-Error: Invalid CSS: @else must come after @if
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 1 | @else{}
   | ^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS: @else must come after @if
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1670.hrx b/spec/libsass-closed-issues/issue_1670.hrx
index 5c3cf73128..9d24fe7a84 100644
--- a/spec/libsass-closed-issues/issue_1670.hrx
+++ b/spec/libsass-closed-issues/issue_1670.hrx
@@ -4,20 +4,6 @@
 }
 
 <===> error
-Error: ".this-should-error" failed to @extend "%an-undefined-placeholder".
-       The selector "%an-undefined-placeholder" was not found.
-       Use "@extend %an-undefined-placeholder !optional" if the extend should be able to fail.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: The target selector was not found.
-       Use "@extend %an-undefined-placeholder !optional" to avoid this error.
-        on line 2 of input.scss
->>     @extend %an-undefined-placeholder;
-   ------------^
-
-<===> error-dart-sass
 Error: The target selector was not found.
 Use "@extend %an-undefined-placeholder !optional" to avoid this error.
   ,
@@ -25,3 +11,10 @@ Use "@extend %an-undefined-placeholder !optional" to avoid this error.
   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: The target selector was not found.
+       Use "@extend %an-undefined-placeholder !optional" to avoid this error.
+        on line 2 of input.scss
+>>     @extend %an-undefined-placeholder;
+   ------------^
diff --git a/spec/libsass-closed-issues/issue_1681/calc.hrx b/spec/libsass-closed-issues/issue_1681/calc.hrx
index e2a116ce2e..8917ee54fb 100644
--- a/spec/libsass-closed-issues/issue_1681/calc.hrx
+++ b/spec/libsass-closed-issues/issue_1681/calc.hrx
@@ -3,16 +3,17 @@
   @return null;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+
+<===> warning
+DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/calc/input.scss:
+Naming a function "calc" is disallowed and will be an error in future versions of Sass.
+This name conflicts with an existing CSS function with special parse rules.
+
+<===> error
 Error: Invalid function name.
   ,
 1 | @function calc() {
   | ^^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
-
-<===> output.css
-<===> warning
-DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/calc/input.scss:
-Naming a function "calc" is disallowed and will be an error in future versions of Sass.
-This name conflicts with an existing CSS function with special parse rules.
diff --git a/spec/libsass-closed-issues/issue_1681/element.hrx b/spec/libsass-closed-issues/issue_1681/element.hrx
index 233e118afb..d1e884d982 100644
--- a/spec/libsass-closed-issues/issue_1681/element.hrx
+++ b/spec/libsass-closed-issues/issue_1681/element.hrx
@@ -3,16 +3,17 @@
   @return null;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+
+<===> warning
+DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/element/input.scss:
+Naming a function "element" is disallowed and will be an error in future versions of Sass.
+This name conflicts with an existing CSS function with special parse rules.
+
+<===> error
 Error: Invalid function name.
   ,
 1 | @function element() {
   | ^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
-
-<===> output.css
-<===> warning
-DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/element/input.scss:
-Naming a function "element" is disallowed and will be an error in future versions of Sass.
-This name conflicts with an existing CSS function with special parse rules.
diff --git a/spec/libsass-closed-issues/issue_1681/expression.hrx b/spec/libsass-closed-issues/issue_1681/expression.hrx
index 7eb5dc3415..35bab265e7 100644
--- a/spec/libsass-closed-issues/issue_1681/expression.hrx
+++ b/spec/libsass-closed-issues/issue_1681/expression.hrx
@@ -3,16 +3,17 @@
   @return null;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+
+<===> warning
+DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/expression/input.scss:
+Naming a function "expression" is disallowed and will be an error in future versions of Sass.
+This name conflicts with an existing CSS function with special parse rules.
+
+<===> error
 Error: Invalid function name.
   ,
 1 | @function expression() {
   | ^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
-
-<===> output.css
-<===> warning
-DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/expression/input.scss:
-Naming a function "expression" is disallowed and will be an error in future versions of Sass.
-This name conflicts with an existing CSS function with special parse rules.
diff --git a/spec/libsass-closed-issues/issue_1681/url.hrx b/spec/libsass-closed-issues/issue_1681/url.hrx
index ed693ca50f..ff45b5a256 100644
--- a/spec/libsass-closed-issues/issue_1681/url.hrx
+++ b/spec/libsass-closed-issues/issue_1681/url.hrx
@@ -3,16 +3,17 @@
   @return null;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+
+<===> warning
+DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/url/input.scss:
+Naming a function "url" is disallowed and will be an error in future versions of Sass.
+This name conflicts with an existing CSS function with special parse rules.
+
+<===> error
 Error: Invalid function name.
   ,
 1 | @function url() {
   | ^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
-
-<===> output.css
-<===> warning
-DEPRECATION WARNING on line 1 of /sass/spec/libsass-issues/issue_1681/url/input.scss:
-Naming a function "url" is disallowed and will be an error in future versions of Sass.
-This name conflicts with an existing CSS function with special parse rules.
diff --git a/spec/libsass-closed-issues/issue_1683/function.hrx b/spec/libsass-closed-issues/issue_1683/function.hrx
index 6ccc85fcb0..314a457ce5 100644
--- a/spec/libsass-closed-issues/issue_1683/function.hrx
+++ b/spec/libsass-closed-issues/issue_1683/function.hrx
@@ -4,7 +4,13 @@
 a {
   b: foo(1 2 3...);
 }
-<===> error-dart-sass
+<===> output-libsass.css
+
+<===> warning
+WARNING: Function foo takes 2 arguments but 3 were passed.
+        on line 4 of input.scss
+This will be an error in future versions of Sass.
+<===> error
 Error: Only 2 arguments allowed, but 3 were passed.
     ,
 1   | @function foo($x, $y) { @return null }
@@ -15,9 +21,3 @@ Error: Only 2 arguments allowed, but 3 were passed.
     '
   input.scss 4:6  foo()
   input.scss 4:6  root stylesheet
-
-<===> output.css
-<===> warning
-WARNING: Function foo takes 2 arguments but 3 were passed.
-        on line 4 of input.scss
-This will be an error in future versions of Sass.
\ No newline at end of file
diff --git a/spec/libsass-closed-issues/issue_1683/mixin.hrx b/spec/libsass-closed-issues/issue_1683/mixin.hrx
index 5948470319..e3e5ba76b6 100644
--- a/spec/libsass-closed-issues/issue_1683/mixin.hrx
+++ b/spec/libsass-closed-issues/issue_1683/mixin.hrx
@@ -5,7 +5,13 @@ a {
   @include foo(1 2 3...);
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+
+<===> warning
+WARNING: Mixin foo takes 2 arguments but 3 were passed.
+        on line 4 of input.scss
+This will be an error in future versions of Sass.
+<===> error
 Error: Only 2 arguments allowed, but 3 were passed.
     ,
 1   | @mixin foo($x, $y) { }
@@ -16,9 +22,3 @@ Error: Only 2 arguments allowed, but 3 were passed.
     '
   input.scss 4:3  foo()
   input.scss 4:3  root stylesheet
-
-<===> output.css
-<===> warning
-WARNING: Mixin foo takes 2 arguments but 3 were passed.
-        on line 4 of input.scss
-This will be an error in future versions of Sass.
\ No newline at end of file
diff --git a/spec/libsass-closed-issues/issue_1706.hrx b/spec/libsass-closed-issues/issue_1706.hrx
index 6821ce6d0e..365aca70c8 100644
--- a/spec/libsass-closed-issues/issue_1706.hrx
+++ b/spec/libsass-closed-issues/issue_1706.hrx
@@ -8,15 +8,7 @@
     c: call(calc, 3px * 3%);
 }
 
-<===> error-dart-sass
-Error: Invalid function name.
-  ,
-1 | @function calc($e) { @return custom; }
-  | ^^^^^^^^^^^^^^^^^^
-  '
-  input.scss 1:1  root stylesheet
-
-<===> output.css
+<===> output-libsass.css
 .test {
   a: calc(1px * 1%);
   b: -foo-calc(2px * 2%);
@@ -31,3 +23,11 @@ This name conflicts with an existing CSS function with special parse rules.
 DEPRECATION WARNING on line 2 of /sass/spec/libsass-issues/issue_1706/input.scss:
 Naming a function "-foo-calc" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
+
+<===> error
+Error: Invalid function name.
+  ,
+1 | @function calc($e) { @return custom; }
+  | ^^^^^^^^^^^^^^^^^^
+  '
+  input.scss 1:1  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_1715.hrx b/spec/libsass-closed-issues/issue_1715.hrx
index ee89c3c8df..2133da9b48 100644
--- a/spec/libsass-closed-issues/issue_1715.hrx
+++ b/spec/libsass-closed-issues/issue_1715.hrx
@@ -3,11 +3,6 @@ div {
   color: red(blue, purple);
 }
 <===> error
-Error: wrong number of arguments (2 for 1) for `red'
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Only 1 argument allowed, but 2 were passed.
   ,--> input.scss
 2 |   color: red(blue, purple);
@@ -18,3 +13,8 @@ Error: Only 1 argument allowed, but 2 were passed.
   |           =========== declaration
   '
   input.scss 2:10  root stylesheet
+
+<===> error-libsass
+Error: wrong number of arguments (2 for 1) for `red'
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1720.hrx b/spec/libsass-closed-issues/issue_1720.hrx
index 9d72e11c29..b8bf5a8adc 100644
--- a/spec/libsass-closed-issues/issue_1720.hrx
+++ b/spec/libsass-closed-issues/issue_1720.hrx
@@ -4,20 +4,15 @@
 }
 
 <===> error
-Error: Invalid CSS after "}": expected ";", was ""
-        on line 4 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Invalid CSS after "    a: a#{b": expected expression (e.g. 1px, bold), was "//}c;"
-        on line 2:10 of input.scss
->>   a: a#{b//}c;
-   ---------^
-
-<===> error-dart-sass
 Error: expected "}".
   ,
 3 | }
   |  ^
   '
   input.scss 3:2  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "    a: a#{b": expected expression (e.g. 1px, bold), was "//}c;"
+        on line 2:10 of input.scss
+>>   a: a#{b//}c;
+   ---------^
diff --git a/spec/libsass-closed-issues/issue_1732/invalid/mixin-def.hrx b/spec/libsass-closed-issues/issue_1732/invalid/mixin-def.hrx
index ceb9d5ef66..55f7d51ef4 100644
--- a/spec/libsass-closed-issues/issue_1732/invalid/mixin-def.hrx
+++ b/spec/libsass-closed-issues/issue_1732/invalid/mixin-def.hrx
@@ -5,11 +5,6 @@
 
 @include a();
 <===> error
-Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Declarations may only be used within style rules.
   ,
 2 |   b: c;
@@ -17,3 +12,8 @@ Error: Declarations may only be used within style rules.
   '
   input.scss 2:3  a()
   input.scss 5:1  root stylesheet
+
+<===> error-libsass
+Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1739/basic.hrx b/spec/libsass-closed-issues/issue_1739/basic.hrx
index a82294fac3..997b13fc97 100644
--- a/spec/libsass-closed-issues/issue_1739/basic.hrx
+++ b/spec/libsass-closed-issues/issue_1739/basic.hrx
@@ -36,22 +36,22 @@ mod {
 <===> output.css
 div {
   baz: 2/3;
-  baz: 2/  3;
-  baz: 2  /3;
-  baz: 2  /  3;
+  baz: 2/3;
+  baz: 2/3;
+  baz: 2/3;
 }
 
 add {
   baz: 5;
   baz: 5;
-  baz: 2  +3;
+  baz: 5;
   baz: 5;
 }
 
 sub {
   baz: -1;
   baz: -1;
-  baz: 2  -3;
+  baz: 2 -3;
   baz: -1;
 }
 
@@ -64,30 +64,30 @@ mul {
 
 mod {
   baz: 2% 3;
-  baz: 2%  3;
+  baz: 2% 3;
   baz: 2;
   baz: 2;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   baz: 2/3;
-  baz: 2/3;
-  baz: 2/3;
-  baz: 2/3;
+  baz: 2/  3;
+  baz: 2  /3;
+  baz: 2  /  3;
 }
 
 add {
   baz: 5;
   baz: 5;
-  baz: 5;
+  baz: 2  +3;
   baz: 5;
 }
 
 sub {
   baz: -1;
   baz: -1;
-  baz: 2 -3;
+  baz: 2  -3;
   baz: -1;
 }
 
@@ -100,7 +100,7 @@ mul {
 
 mod {
   baz: 2% 3;
-  baz: 2% 3;
+  baz: 2%  3;
   baz: 2;
   baz: 2;
 }
diff --git a/spec/libsass-closed-issues/issue_1739/interpolate/both.hrx b/spec/libsass-closed-issues/issue_1739/interpolate/both.hrx
index 837cce8849..497c33532f 100644
--- a/spec/libsass-closed-issues/issue_1739/interpolate/both.hrx
+++ b/spec/libsass-closed-issues/issue_1739/interpolate/both.hrx
@@ -39,12 +39,12 @@ mod {
   baz: #{1  %  2}  %  #{1  %  2};
 }
 <===> error
-Error: Undefined operation: "2 times 2".
-
-<===> error-dart-sass
 Error: Undefined operation "2 * 2".
    ,
 23 |   baz: #{1*2}*#{1*2};
    |        ^^^^^^^^^^^^^
    '
   input.scss 23:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2 times 2".
diff --git a/spec/libsass-closed-issues/issue_1739/interpolate/left.hrx b/spec/libsass-closed-issues/issue_1739/interpolate/left.hrx
index 960685f7b2..3d55468238 100644
--- a/spec/libsass-closed-issues/issue_1739/interpolate/left.hrx
+++ b/spec/libsass-closed-issues/issue_1739/interpolate/left.hrx
@@ -39,12 +39,12 @@ mod {
   baz: #{1  %  2}  %  3;
 }
 <===> error
-Error: Undefined operation: "2 times 3".
-
-<===> error-dart-sass
 Error: Undefined operation "2 * 3".
    ,
 23 |   baz: #{1*2}*3;
    |        ^^^^^^^^
    '
   input.scss 23:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2 times 3".
diff --git a/spec/libsass-closed-issues/issue_1739/interpolate/right.hrx b/spec/libsass-closed-issues/issue_1739/interpolate/right.hrx
index 3f57ddb3c6..0f02ddef92 100644
--- a/spec/libsass-closed-issues/issue_1739/interpolate/right.hrx
+++ b/spec/libsass-closed-issues/issue_1739/interpolate/right.hrx
@@ -39,12 +39,12 @@ mod {
   baz: 3 %  #{1  %  2};
 }
 <===> error
-Error: Undefined operation: "3 times 2".
-
-<===> error-dart-sass
 Error: Undefined operation "3 * 2".
    ,
 23 |   baz: 3*#{1*2};
    |        ^^^^^^^^
    '
   input.scss 23:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "3 times 2".
diff --git a/spec/libsass-closed-issues/issue_1792.hrx b/spec/libsass-closed-issues/issue_1792.hrx
index 49d85291d6..babc36191c 100644
--- a/spec/libsass-closed-issues/issue_1792.hrx
+++ b/spec/libsass-closed-issues/issue_1792.hrx
@@ -10,14 +10,14 @@ test {
 }
 <===> output.css
 test {
-  test1: 12px;
-  test2: 14px;
+  test1: 0.125in;
+  test2: 0.1458333333in;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 test {
-  test1: 0.125in;
-  test2: 0.1458333333in;
+  test1: 12px;
+  test2: 14px;
 }
 
 <===> warning
diff --git a/spec/libsass-closed-issues/issue_1793.hrx b/spec/libsass-closed-issues/issue_1793.hrx
index e4d5dd7cf7..360cb03536 100644
--- a/spec/libsass-closed-issues/issue_1793.hrx
+++ b/spec/libsass-closed-issues/issue_1793.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: 10in*px isn't a valid CSS value.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: 10px*in isn't a valid CSS value.
   ,
 1 | @media (max-width: (2px*5in)) {
   |                    ^^^^^^^^^
   '
   input.scss 1:20  root stylesheet
+
+<===> error-libsass
+Error: 10in*px isn't a valid CSS value.
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1801/import-cycle.hrx b/spec/libsass-closed-issues/issue_1801/import-cycle.hrx
index c1478762c0..ef956adb95 100644
--- a/spec/libsass-closed-issues/issue_1801/import-cycle.hrx
+++ b/spec/libsass-closed-issues/issue_1801/import-cycle.hrx
@@ -1,23 +1,13 @@
+<===> input.scss
+@import 'alpha';
+
 <===> _alpha.scss
 @import 'beta';
 
 <===> _beta.scss
 @import 'alpha';
 
-<===> input.scss
-@import 'alpha';
-
 <===> error
-Error: An @import loop has been found:
-           input.scss imports _alpha.scss
-           _alpha.scss imports _beta.scss
-           _beta.scss imports _alpha.scss
-        on line 1 of _beta.scss
-        from line 1 of _alpha.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This file is already being loaded.
   ,--> _beta.scss
 1 | @import 'alpha';
@@ -30,3 +20,13 @@ Error: This file is already being loaded.
   _beta.scss 1:9   @import
   _alpha.scss 1:9  @import
   input.scss 1:9   root stylesheet
+
+<===> error-libsass
+Error: An @import loop has been found:
+           input.scss imports _alpha.scss
+           _alpha.scss imports _beta.scss
+           _beta.scss imports _alpha.scss
+        on line 1 of _beta.scss
+        from line 1 of _alpha.scss
+        from line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1803/nested.hrx b/spec/libsass-closed-issues/issue_1803/nested.hrx
index b6168ca29d..7139047568 100644
--- a/spec/libsass-closed-issues/issue_1803/nested.hrx
+++ b/spec/libsass-closed-issues/issue_1803/nested.hrx
@@ -10,14 +10,14 @@ a {
 }
 
 <===> error
-Error: Illegal nesting: Only properties may be nested beneath properties.
-        on line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ":".
   ,
 5 |     c {
   |       ^
   '
   input.scss 5:7  root stylesheet
+
+<===> error-libsass
+Error: Illegal nesting: Only properties may be nested beneath properties.
+        on line 5 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1804/inline.hrx b/spec/libsass-closed-issues/issue_1804/inline.hrx
index 3aa1631f15..4a7a40c7a3 100644
--- a/spec/libsass-closed-issues/issue_1804/inline.hrx
+++ b/spec/libsass-closed-issues/issue_1804/inline.hrx
@@ -4,14 +4,14 @@ foo {
 }
 
 <===> error
-Error: 10in*px isn't a valid CSS value.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: 10px*in isn't a valid CSS value.
   ,
 2 |   bar: #{(2px*5in)};
   |          ^^^^^^^^^
   '
   input.scss 2:10  root stylesheet
+
+<===> error-libsass
+Error: 10in*px isn't a valid CSS value.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1804/variable.hrx b/spec/libsass-closed-issues/issue_1804/variable.hrx
index 55f5b6fac2..989d25a978 100644
--- a/spec/libsass-closed-issues/issue_1804/variable.hrx
+++ b/spec/libsass-closed-issues/issue_1804/variable.hrx
@@ -7,14 +7,14 @@ foo {
 }
 
 <===> error
-Error: 10in*px isn't a valid CSS value.
-        on line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: 10px*in isn't a valid CSS value.
   ,
 5 |   bar: #{($foo*$bar)};
   |          ^^^^^^^^^^^
   '
   input.scss 5:10  root stylesheet
+
+<===> error-libsass
+Error: 10in*px isn't a valid CSS value.
+        on line 5 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1822.hrx b/spec/libsass-closed-issues/issue_1822.hrx
index cae653e694..82156eae26 100644
--- a/spec/libsass-closed-issues/issue_1822.hrx
+++ b/spec/libsass-closed-issues/issue_1822.hrx
@@ -6,16 +6,16 @@
 }
 
 <===> error
-Error: Invalid CSS after ".open": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 2 |     .open&{
   |          ^
   '
   input.scss 2:10  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after ".open": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_185/media_wrapper_selector.hrx b/spec/libsass-closed-issues/issue_185/media_wrapper_selector.hrx
index e5801e2497..11b6fcbc98 100644
--- a/spec/libsass-closed-issues/issue_185/media_wrapper_selector.hrx
+++ b/spec/libsass-closed-issues/issue_185/media_wrapper_selector.hrx
@@ -25,7 +25,7 @@
     content: baz;
   }
 }
-@media all and (min-width: 1337px) {
+@media (min-width: 1337px) {
   .foo {
     content: bar;
   }
@@ -35,24 +35,24 @@
     content: baz;
   }
 }
-@media all and (min-width: 1337px) {
+@media (min-width: 1337px) {
   .baz {
     content: foo;
   }
 }
-@media all and (min-width: 1337px) and (max-width: 42em) {
+@media (min-width: 1337px) and (max-width: 42em) {
   .foo {
     content: bar;
   }
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @media all {
   .bar {
     content: baz;
   }
 }
-@media (min-width: 1337px) {
+@media all and (min-width: 1337px) {
   .foo {
     content: bar;
   }
@@ -62,12 +62,12 @@
     content: baz;
   }
 }
-@media (min-width: 1337px) {
+@media all and (min-width: 1337px) {
   .baz {
     content: foo;
   }
 }
-@media (min-width: 1337px) and (max-width: 42em) {
+@media all and (min-width: 1337px) and (max-width: 42em) {
   .foo {
     content: bar;
   }
diff --git a/spec/libsass-closed-issues/issue_185/mixin.hrx b/spec/libsass-closed-issues/issue_185/mixin.hrx
index 85e911732b..9df1f3bb55 100644
--- a/spec/libsass-closed-issues/issue_185/mixin.hrx
+++ b/spec/libsass-closed-issues/issue_185/mixin.hrx
@@ -40,20 +40,20 @@
   }
 }
 
-@media all and (min-width: 42em) {
+@media (min-width: 42em) {
   .foo {
     content: bar;
   }
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @media only screen and (color) and (orientation: portrait) {
   .foo {
     content: bar;
   }
 }
 
-@media (min-width: 42em) {
+@media all and (min-width: 42em) {
   .foo {
     content: bar;
   }
diff --git a/spec/libsass-closed-issues/issue_185/selector_wrapper_media.hrx b/spec/libsass-closed-issues/issue_185/selector_wrapper_media.hrx
index 857261ba4b..41100636b5 100644
--- a/spec/libsass-closed-issues/issue_185/selector_wrapper_media.hrx
+++ b/spec/libsass-closed-issues/issue_185/selector_wrapper_media.hrx
@@ -29,7 +29,7 @@
     content: baz;
   }
 }
-@media all and (min-width: 1337px) {
+@media (min-width: 1337px) {
   .foo {
     content: bar;
   }
@@ -40,25 +40,24 @@
     content: baz;
   }
 }
-@media all and (min-width: 1337px) {
+@media (min-width: 1337px) {
   .foo {
     content: foo;
   }
 }
-
-@media all and (min-width: 1337px) and (max-width: 42em) {
+@media (min-width: 1337px) and (max-width: 42em) {
   .foo {
     content: bar;
   }
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @media all {
   .foo {
     content: baz;
   }
 }
-@media (min-width: 1337px) {
+@media all and (min-width: 1337px) {
   .foo {
     content: bar;
   }
@@ -69,12 +68,13 @@
     content: baz;
   }
 }
-@media (min-width: 1337px) {
+@media all and (min-width: 1337px) {
   .foo {
     content: foo;
   }
 }
-@media (min-width: 1337px) and (max-width: 42em) {
+
+@media all and (min-width: 1337px) and (max-width: 42em) {
   .foo {
     content: bar;
   }
diff --git a/spec/libsass-closed-issues/issue_1873.hrx b/spec/libsass-closed-issues/issue_1873.hrx
index ed07ce8abd..014ee53369 100644
--- a/spec/libsass-closed-issues/issue_1873.hrx
+++ b/spec/libsass-closed-issues/issue_1873.hrx
@@ -9,14 +9,14 @@
   }
 }
 <===> error
-Error: Extend directives may only be used within rules.
-input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: @extend may only be used within style rules.
   ,
 7 |     @extend .a;
   |     ^^^^^^^^^^
   '
   input.scss 7:5  root stylesheet
+
+<===> error-libsass
+Error: Extend directives may only be used within rules.
+input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1916.hrx b/spec/libsass-closed-issues/issue_1916.hrx
index 54f30142b0..401995f214 100644
--- a/spec/libsass-closed-issues/issue_1916.hrx
+++ b/spec/libsass-closed-issues/issue_1916.hrx
@@ -16,20 +16,6 @@
 }
 
 <===> error
-Error: ".btn:hover" failed to @extend ".z-depth-half-1".
-       The selector ".z-depth-half-1" was not found.
-       Use "@extend .z-depth-half-1 !optional" if the extend should be able to fail.
-        on line 13 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: The target selector was not found.
-       Use "@extend .z-depth-half-1 !optional" to avoid this error.
-        on line 13 of input.scss
->>     @extend .z-depth-half-1;
-   ------------^
-
-<===> error-dart-sass
 Error: The target selector was not found.
 Use "@extend .z-depth-half-1 !optional" to avoid this error.
    ,
@@ -37,3 +23,10 @@ Use "@extend .z-depth-half-1 !optional" to avoid this error.
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    '
   input.scss 13:5  root stylesheet
+
+<===> error-libsass
+Error: The target selector was not found.
+       Use "@extend .z-depth-half-1 !optional" to avoid this error.
+        on line 13 of input.scss
+>>     @extend .z-depth-half-1;
+   ------------^
diff --git a/spec/libsass-closed-issues/issue_192.hrx b/spec/libsass-closed-issues/issue_192.hrx
index e0e09078a1..2636fb1532 100644
--- a/spec/libsass-closed-issues/issue_192.hrx
+++ b/spec/libsass-closed-issues/issue_192.hrx
@@ -18,34 +18,6 @@ body {
 }
 
 <===> warning
-WARNING: Starting loop
-         on line 2 of input.scss
-
-WARNING: Step 0
-         on line 4 of input.scss
-
-WARNING: Step 1
-         on line 4 of input.scss
-
-WARNING: Finished loop
-         on line 6 of input.scss
-
-WARNING: Starting loop
-         on line 2 of input.scss
-
-WARNING: Step -1
-         on line 4 of input.scss
-
-WARNING: Step 0
-         on line 4 of input.scss
-
-WARNING: Step 1
-         on line 4 of input.scss
-
-WARNING: Finished loop
-         on line 6 of input.scss
-
-<===> warning-dart-sass
 WARNING: Starting loop
     input.scss 2:5    test()
     input.scss 10:12  root stylesheet
@@ -81,3 +53,31 @@ WARNING: Step 1
 WARNING: Finished loop
     input.scss 6:5    test()
     input.scss 11:13  root stylesheet
+
+<===> warning-libsass
+WARNING: Starting loop
+         on line 2 of input.scss
+
+WARNING: Step 0
+         on line 4 of input.scss
+
+WARNING: Step 1
+         on line 4 of input.scss
+
+WARNING: Finished loop
+         on line 6 of input.scss
+
+WARNING: Starting loop
+         on line 2 of input.scss
+
+WARNING: Step -1
+         on line 4 of input.scss
+
+WARNING: Step 0
+         on line 4 of input.scss
+
+WARNING: Step 1
+         on line 4 of input.scss
+
+WARNING: Finished loop
+         on line 6 of input.scss
diff --git a/spec/libsass-closed-issues/issue_1923.hrx b/spec/libsass-closed-issues/issue_1923.hrx
index 0aff68b79b..6fe816a11e 100644
--- a/spec/libsass-closed-issues/issue_1923.hrx
+++ b/spec/libsass-closed-issues/issue_1923.hrx
@@ -15,20 +15,6 @@
   }
 }
 <===> error
-Error: You may not @extend an outer selector from within @media.
-       You may only @extend selectors within the same directive.
-input.scss.
-input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: You may not @extend selectors across media queries.
-      Use "@extend %btnBase !optional" to avoid this error.
-      on line 7:7 of inpit.scss, in mixin `mobile`
-      from line 11:12 of input.scss
->>       @extend %btnBase
-
-<===> error-dart-sass
 Error: From line 1, column 1 of input.scss: 
   ,
 1 | %btnBase {
@@ -40,3 +26,10 @@ You may not @extend selectors across media queries.
    |     ^^^^^^^^^^^^^^^^
    '
   input.scss 13:5  root stylesheet
+
+<===> error-libsass
+Error: You may not @extend selectors across media queries.
+      Use "@extend %btnBase !optional" to avoid this error.
+      on line 7:7 of inpit.scss, in mixin `mobile`
+      from line 11:12 of input.scss
+>>       @extend %btnBase
diff --git a/spec/libsass-closed-issues/issue_1941/function_function.hrx b/spec/libsass-closed-issues/issue_1941/function_function.hrx
index 9b0af4ef5f..684e17603f 100644
--- a/spec/libsass-closed-issues/issue_1941/function_function.hrx
+++ b/spec/libsass-closed-issues/issue_1941/function_function.hrx
@@ -13,14 +13,14 @@ test {
 }
 
 <===> error
-Error: Functions can only contain variable declarations and control directives.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @function nested() {
   |   ^^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions can only contain variable declarations and control directives.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1941/function_mixin.hrx b/spec/libsass-closed-issues/issue_1941/function_mixin.hrx
index 1bbbb76eb1..5199a506c8 100644
--- a/spec/libsass-closed-issues/issue_1941/function_mixin.hrx
+++ b/spec/libsass-closed-issues/issue_1941/function_mixin.hrx
@@ -13,14 +13,14 @@ test {
 }
 
 <===> error
-Error: Functions can only contain variable declarations and control directives.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @mixin nested {
   |   ^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions can only contain variable declarations and control directives.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1941/mixin_function.hrx b/spec/libsass-closed-issues/issue_1941/mixin_function.hrx
index 0b0dc65735..a2e421d149 100644
--- a/spec/libsass-closed-issues/issue_1941/mixin_function.hrx
+++ b/spec/libsass-closed-issues/issue_1941/mixin_function.hrx
@@ -13,14 +13,14 @@ test {
 }
 
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not contain function declarations.
   ,
 2 |   @function nested() {
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1941/mixin_mixin.hrx b/spec/libsass-closed-issues/issue_1941/mixin_mixin.hrx
index 93d651cce4..38074c9b17 100644
--- a/spec/libsass-closed-issues/issue_1941/mixin_mixin.hrx
+++ b/spec/libsass-closed-issues/issue_1941/mixin_mixin.hrx
@@ -13,14 +13,14 @@ test {
 }
 
 <===> error
-Error: Mixins may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not contain mixin declarations.
   ,
 2 |   @mixin nested {
   |   ^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Mixins may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_1994.hrx b/spec/libsass-closed-issues/issue_1994.hrx
index a77b511050..2e545967c8 100644
--- a/spec/libsass-closed-issues/issue_1994.hrx
+++ b/spec/libsass-closed-issues/issue_1994.hrx
@@ -15,7 +15,7 @@
 }
 <===> output.css
 .productportal-link:hover, .productportal-link:focus {
-  opacity: .8;
+  opacity: 0.8;
 }
 @supports (filter: brightness(120%)) {
   .productportal-link:hover, .productportal-link:focus {
@@ -23,9 +23,9 @@
   }
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .productportal-link:hover, .productportal-link:focus {
-  opacity: 0.8;
+  opacity: .8;
 }
 @supports (filter: brightness(120%)) {
   .productportal-link:hover, .productportal-link:focus {
diff --git a/spec/libsass-closed-issues/issue_2023/id-selector-id.hrx b/spec/libsass-closed-issues/issue_2023/id-selector-id.hrx
index 57d248e673..945e6866a1 100644
--- a/spec/libsass-closed-issues/issue_2023/id-selector-id.hrx
+++ b/spec/libsass-closed-issues/issue_2023/id-selector-id.hrx
@@ -3,15 +3,15 @@
     color: red;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+#2b {
+  color: red;
+}
+
+<===> error
 Error: Expected identifier.
   ,
 1 | #2b{
   |  ^
   '
   input.scss 1:2  root stylesheet
-
-<===> output.css
-#2b {
-  color: red;
-}
diff --git a/spec/libsass-closed-issues/issue_2023/id-selector-nr.hrx b/spec/libsass-closed-issues/issue_2023/id-selector-nr.hrx
index 839ad142e4..d4f0794601 100644
--- a/spec/libsass-closed-issues/issue_2023/id-selector-nr.hrx
+++ b/spec/libsass-closed-issues/issue_2023/id-selector-nr.hrx
@@ -3,15 +3,15 @@
     color: red;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+#2 {
+  color: red;
+}
+
+<===> error
 Error: Expected identifier.
   ,
 1 | #2{
   |  ^
   '
   input.scss 1:2  root stylesheet
-
-<===> output.css
-#2 {
-  color: red;
-}
diff --git a/spec/libsass-closed-issues/issue_2023/pseudo-selector-id.hrx b/spec/libsass-closed-issues/issue_2023/pseudo-selector-id.hrx
index c57ec69249..e2e6c92858 100644
--- a/spec/libsass-closed-issues/issue_2023/pseudo-selector-id.hrx
+++ b/spec/libsass-closed-issues/issue_2023/pseudo-selector-id.hrx
@@ -3,15 +3,15 @@
     color: red;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+#4d {
+  color: red;
+}
+
+<===> error
 Error: Expected identifier.
   ,
 1 | #4d{
   |  ^
   '
   input.scss 1:2  root stylesheet
-
-<===> output.css
-#4d {
-  color: red;
-}
diff --git a/spec/libsass-closed-issues/issue_2023/pseudo-selector-nr.hrx b/spec/libsass-closed-issues/issue_2023/pseudo-selector-nr.hrx
index 39cf2d0c98..1b0c7129bc 100644
--- a/spec/libsass-closed-issues/issue_2023/pseudo-selector-nr.hrx
+++ b/spec/libsass-closed-issues/issue_2023/pseudo-selector-nr.hrx
@@ -3,15 +3,15 @@
     color: red;
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+#4 {
+  color: red;
+}
+
+<===> error
 Error: Expected identifier.
   ,
 1 | #4{
   |  ^
   '
   input.scss 1:2  root stylesheet
-
-<===> output.css
-#4 {
-  color: red;
-}
diff --git a/spec/libsass-closed-issues/issue_2081.hrx b/spec/libsass-closed-issues/issue_2081.hrx
index a0310522a8..f3b8358b32 100644
--- a/spec/libsass-closed-issues/issue_2081.hrx
+++ b/spec/libsass-closed-issues/issue_2081.hrx
@@ -2,14 +2,14 @@
 $foo: #{bar();};
 
 <===> error
-Error: Invalid CSS after "$foo: #{bar()": expected "}", was ";};"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "}".
   ,
 1 | $foo: #{bar();};
   |              ^
   '
   input.scss 1:14  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "$foo: #{bar()": expected "}", was ";};"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2106/test.hrx b/spec/libsass-closed-issues/issue_2106/test.hrx
index 6758e2f80f..8705b322a8 100644
--- a/spec/libsass-closed-issues/issue_2106/test.hrx
+++ b/spec/libsass-closed-issues/issue_2106/test.hrx
@@ -2,14 +2,14 @@
 @import "../does-not-exist";
 
 <===> error
-Error: File to import not found or unreadable: ../does-not-exist.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Can't find stylesheet to import.
   ,
 1 | @import "../does-not-exist";
   |         ^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:9  root stylesheet
+
+<===> error-libsass
+Error: File to import not found or unreadable: ../does-not-exist.
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2123/test-02.hrx b/spec/libsass-closed-issues/issue_2123/test-02.hrx
index 1922a6d282..528a7f389c 100644
--- a/spec/libsass-closed-issues/issue_2123/test-02.hrx
+++ b/spec/libsass-closed-issues/issue_2123/test-02.hrx
@@ -2,12 +2,12 @@
 @font-face { font-family:'foo';src:url(//foo.bar) format('woff2'); }
 <===> output.css
 @font-face {
-  font-family: 'foo';
+  font-family: "foo";
   src: url(//foo.bar) format("woff2");
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @font-face {
-  font-family: "foo";
+  font-family: 'foo';
   src: url(//foo.bar) format("woff2");
 }
diff --git a/spec/libsass-closed-issues/issue_2124.hrx b/spec/libsass-closed-issues/issue_2124.hrx
index 568b595fd1..a276e63c3a 100644
--- a/spec/libsass-closed-issues/issue_2124.hrx
+++ b/spec/libsass-closed-issues/issue_2124.hrx
@@ -48,14 +48,14 @@ parentless {
 }
 
 .js:root .bou {
-  content: 'bar';
+  content: "bar";
 }
 
 .js:root .bou .bar {
-  content: 'baz';
+  content: "baz";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 test {
   test-01: true;
   test-01: true;
@@ -70,9 +70,9 @@ parentless {
 }
 
 .js:root .bou {
-  content: "bar";
+  content: 'bar';
 }
 
 .js:root .bou .bar {
-  content: "baz";
+  content: 'baz';
 }
diff --git a/spec/libsass-closed-issues/issue_2139.hrx b/spec/libsass-closed-issues/issue_2139.hrx
index 846d6a3286..850e9161cb 100644
--- a/spec/libsass-closed-issues/issue_2139.hrx
+++ b/spec/libsass-closed-issues/issue_2139.hrx
@@ -19,20 +19,20 @@
 }
 
 .bar .baz {
-  border: '1px';
+  border: "1px";
 }
 
 *:not(.foo) {
   display: none;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .foo, .bar .baz {
   color: #FFF;
 }
 
 .bar .baz {
-  border: "1px";
+  border: '1px';
 }
 
 *:not(.foo) {
diff --git a/spec/libsass-closed-issues/issue_2143.hrx b/spec/libsass-closed-issues/issue_2143.hrx
index 725830f4a2..9ee2a5bbf8 100644
--- a/spec/libsass-closed-issues/issue_2143.hrx
+++ b/spec/libsass-closed-issues/issue_2143.hrx
@@ -1,14 +1,14 @@
 <===> input.scss
 $map:;
 <===> error
-Error: Invalid CSS after "$map:": expected expression (e.g. 1px, bold), was ";"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | $map:;
   |      ^
   '
   input.scss 1:6  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "$map:": expected expression (e.g. 1px, bold), was ";"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2147/lhs.hrx b/spec/libsass-closed-issues/issue_2147/lhs.hrx
index 120b8c430d..4fa5bbdcc5 100644
--- a/spec/libsass-closed-issues/issue_2147/lhs.hrx
+++ b/spec/libsass-closed-issues/issue_2147/lhs.hrx
@@ -2,14 +2,14 @@
 $map: (a:b,c:d) + 1;
 
 <===> error
-Error: (a: b, c: d) isn't a valid CSS value.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: (a: b, c: d) isn't a valid CSS value.
   ,
 1 | $map: (a:b,c:d) + 1;
   |       ^^^^^^^^^^^^^
   '
   input.scss 1:7  root stylesheet
+
+<===> error-libsass
+Error: (a: b, c: d) isn't a valid CSS value.
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2147/rhs.hrx b/spec/libsass-closed-issues/issue_2147/rhs.hrx
index 9c0b5074a5..c9ef1b8e47 100644
--- a/spec/libsass-closed-issues/issue_2147/rhs.hrx
+++ b/spec/libsass-closed-issues/issue_2147/rhs.hrx
@@ -2,14 +2,14 @@
 $map: 1 + (a:b,c:d);
 
 <===> error
-Error: (a: b, c: d) isn't a valid CSS value.
-        on line 1 of /sass/spec/libsass-issues/issue_2147/input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: (a: b, c: d) isn't a valid CSS value.
   ,
 1 | $map: 1 + (a:b,c:d);
   |       ^^^^^^^^^^^^^
   '
   input.scss 1:7  root stylesheet
+
+<===> error-libsass
+Error: (a: b, c: d) isn't a valid CSS value.
+        on line 1 of /sass/spec/libsass-issues/issue_2147/input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2155.hrx b/spec/libsass-closed-issues/issue_2155.hrx
index 9492bfc6b2..60e2896f89 100644
--- a/spec/libsass-closed-issues/issue_2155.hrx
+++ b/spec/libsass-closed-issues/issue_2155.hrx
@@ -6,17 +6,6 @@ a {
 }
 
 <===> error
-WARNING on line 2, column 5 of input.scss:
-You probably don't mean to use the color value `#ff0' in interpolation here.
-It may end up represented as #ffff00, which will likely produce invalid CSS.
-Always quote color names when using them as strings (for example, "#ff0").
-If you really want to use the color value here, use `"" + #ff0'.
-
-Error: Invalid CSS after "&.": expected class name, was "#ff0"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 WARNING: You probably don't mean to use the color value yellow in interpolation here.
 It may end up represented as #ff0, which will likely produce invalid CSS.
 Always quote color names when using them as strings or map keys (for example, "yellow").
diff --git a/spec/libsass-closed-issues/issue_2156/error.hrx b/spec/libsass-closed-issues/issue_2156/error.hrx
index a6c07e2055..5b438b1147 100644
--- a/spec/libsass-closed-issues/issue_2156/error.hrx
+++ b/spec/libsass-closed-issues/issue_2156/error.hrx
@@ -2,14 +2,14 @@
 @error unquote("\"foo\" and \"bar\"");
 
 <===> error
-Error: "foo" and "bar"
-        on line 1 of /sass/spec/libsass-issues/issue_2156/input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "foo" and "bar"
   ,
 1 | @error unquote("\"foo\" and \"bar\"");
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: "foo" and "bar"
+        on line 1 of /sass/spec/libsass-issues/issue_2156/input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2156/warn.hrx b/spec/libsass-closed-issues/issue_2156/warn.hrx
index c587a8eb07..b3b397d2ec 100644
--- a/spec/libsass-closed-issues/issue_2156/warn.hrx
+++ b/spec/libsass-closed-issues/issue_2156/warn.hrx
@@ -6,34 +6,35 @@
 @warn unquote("\"foo\" and \"bar\"");
 
 <===> output.css
+
 <===> warning
 WARNING: "foo"
-         on line 7 of /sass/spec/libsass-issues/issue_2156/input.scss
+    input.scss 1:1  root stylesheet
 
 WARNING: "foo"
-         on line 8 of /sass/spec/libsass-issues/issue_2156/input.scss
+    input.scss 2:1  root stylesheet
 
 WARNING: "foo
-         on line 9 of /sass/spec/libsass-issues/issue_2156/input.scss
+    input.scss 3:1  root stylesheet
 
 WARNING: "foo"bar
-         on line 10 of /sass/spec/libsass-issues/issue_2156/input.scss
+    input.scss 4:1  root stylesheet
 
 WARNING: "foo" and "bar"
-         on line 11 of /sass/spec/libsass-issues/issue_2156/input.scss
+    input.scss 5:1  root stylesheet
 
-<===> warning-dart-sass
+<===> warning-libsass
 WARNING: "foo"
-    input.scss 1:1  root stylesheet
+         on line 7 of /sass/spec/libsass-issues/issue_2156/input.scss
 
 WARNING: "foo"
-    input.scss 2:1  root stylesheet
+         on line 8 of /sass/spec/libsass-issues/issue_2156/input.scss
 
 WARNING: "foo
-    input.scss 3:1  root stylesheet
+         on line 9 of /sass/spec/libsass-issues/issue_2156/input.scss
 
 WARNING: "foo"bar
-    input.scss 4:1  root stylesheet
+         on line 10 of /sass/spec/libsass-issues/issue_2156/input.scss
 
 WARNING: "foo" and "bar"
-    input.scss 5:1  root stylesheet
+         on line 11 of /sass/spec/libsass-issues/issue_2156/input.scss
diff --git a/spec/libsass-closed-issues/issue_2175.hrx b/spec/libsass-closed-issues/issue_2175.hrx
index d94532791a..aedddd2414 100644
--- a/spec/libsass-closed-issues/issue_2175.hrx
+++ b/spec/libsass-closed-issues/issue_2175.hrx
@@ -4,20 +4,15 @@ a:nth-child() {
 }
 
 <===> error
-Error: Invalid CSS after "a:nth-child(": expected An+B expression, was ")"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Invalid CSS after "a:nth-child(": expected An+B expression, was ") {"
-        on line 1:3 of input.scss
->> a:nth-child() {
-   --^
-
-<===> error-dart-sass
 Error: Expected "n".
   ,
 1 | a:nth-child(){
   |             ^
   '
   input.scss 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "a:nth-child(": expected An+B expression, was ") {"
+        on line 1:3 of input.scss
+>> a:nth-child() {
+   --^
diff --git a/spec/libsass-closed-issues/issue_2246.hrx b/spec/libsass-closed-issues/issue_2246.hrx
index d11ceb0296..3e9d609fa1 100644
--- a/spec/libsass-closed-issues/issue_2246.hrx
+++ b/spec/libsass-closed-issues/issue_2246.hrx
@@ -24,10 +24,10 @@
 }
 <===> output.css
 .bar {
-  content: 'foo';
+  content: "foo";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .bar {
-  content: "foo";
+  content: 'foo';
 }
diff --git a/spec/libsass-closed-issues/issue_2260/no-parent-with-compound.hrx b/spec/libsass-closed-issues/issue_2260/no-parent-with-compound.hrx
index ba7f7f124e..78c71e1ffd 100644
--- a/spec/libsass-closed-issues/issue_2260/no-parent-with-compound.hrx
+++ b/spec/libsass-closed-issues/issue_2260/no-parent-with-compound.hrx
@@ -12,20 +12,6 @@
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 8 of input.scss, in `@content'
-        from line 3 of input.scss, in `test'
-        from line 7 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 3:7 of input.scss, in mixin `test`
-        from line 7:12 of input.scss
->>     .test & {
-   ----^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 8 |   .test & {
@@ -34,3 +20,10 @@ Error: Top-level selectors may not contain the parent selector "&".
   input.scss 8:3  @content
   input.scss 3:5  test()
   input.scss 7:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 3:7 of input.scss, in mixin `test`
+        from line 7:12 of input.scss
+>>     .test & {
+   ----^
diff --git a/spec/libsass-closed-issues/issue_2291.hrx b/spec/libsass-closed-issues/issue_2291.hrx
index c2979b53ed..03c84336b2 100644
--- a/spec/libsass-closed-issues/issue_2291.hrx
+++ b/spec/libsass-closed-issues/issue_2291.hrx
@@ -40,7 +40,7 @@ A {
   font-size: 1em;
 }
 
-foo bar[baz="foo"][str="&"] {
+foo bar[baz=foo][str="&"] {
   asd: qwe;
 }
 
@@ -60,12 +60,12 @@ A BAC .b A .b, A BAC .b A .c, A BAC .b A .d-foo, A BAC .c A .b, A BAC .c A .c, A
   itpl: A BAC .b A .b, A BAC .b A .c, A BAC .b A .d-foo, A BAC .c A .b, A BAC .c A .c, A BAC .c A .d-foo, A BAC .d A .b, A BAC .d A .c, A BAC .d A .d-foobar;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .m__exhibit-header--medium--plain, .m__exhibit-header--medium {
   font-size: 1em;
 }
 
-foo bar[baz=foo][str="&"] {
+foo bar[baz="foo"][str="&"] {
   asd: qwe;
 }
 
diff --git a/spec/libsass-closed-issues/issue_2304.hrx b/spec/libsass-closed-issues/issue_2304.hrx
index 2e51e15a61..474f7864b9 100644
--- a/spec/libsass-closed-issues/issue_2304.hrx
+++ b/spec/libsass-closed-issues/issue_2304.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "module";
 <===> _module.scss
 .foo, & {
   background: red;
@@ -6,21 +8,7 @@
 .foo, &:before {
   background: red;
 }
-<===> input.scss
-@import "module";
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of _module.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1:9 of input.scss
->> .foo, & {
-   ------^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | .foo, & {
@@ -28,3 +16,9 @@ Error: Top-level selectors may not contain the parent selector "&".
   '
   _module.scss 1:1  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1:9 of input.scss
+>> .foo, & {
+   ------^
diff --git a/spec/libsass-closed-issues/issue_2307.hrx b/spec/libsass-closed-issues/issue_2307.hrx
index c9cf62c1ba..1de0123fb8 100644
--- a/spec/libsass-closed-issues/issue_2307.hrx
+++ b/spec/libsass-closed-issues/issue_2307.hrx
@@ -3,11 +3,6 @@
 {
 
 <===> error
-Error: Invalid CSS after "{": expected "}", was ""
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "}".
   ,
 2 | {
diff --git a/spec/libsass-closed-issues/issue_2346.hrx b/spec/libsass-closed-issues/issue_2346.hrx
index 41754d3aa6..9e6bfaac97 100644
--- a/spec/libsass-closed-issues/issue_2346.hrx
+++ b/spec/libsass-closed-issues/issue_2346.hrx
@@ -6,11 +6,11 @@ li {
   }
 }
 <===> output.css
-li:nth-child(3n - 3) {
+li:nth-child(3n-3) {
   color: red;
 }
 
-<===> output-dart-sass.css
-li:nth-child(3n-3) {
+<===> output-libsass.css
+li:nth-child(3n - 3) {
   color: red;
 }
diff --git a/spec/libsass-closed-issues/issue_2352.hrx b/spec/libsass-closed-issues/issue_2352.hrx
index c86c87ef91..513ba4650f 100644
--- a/spec/libsass-closed-issues/issue_2352.hrx
+++ b/spec/libsass-closed-issues/issue_2352.hrx
@@ -9,12 +9,6 @@ $theme: (red: #D700EE);
 	color: test($theme...);
 }
 <===> error
-Error: Variable keyword argument map must have string keys.
-       #ff0000 is not a string in (red: #D700EE).
-        on line 8 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Variable keyword argument map must have string keys.
 red is not a string in (red: #D700EE).
   ,
@@ -22,3 +16,9 @@ red is not a string in (red: #D700EE).
   |                 ^^^^^^
   '
   input.scss 8:14  root stylesheet
+
+<===> error-libsass
+Error: Variable keyword argument map must have string keys.
+       #ff0000 is not a string in (red: #D700EE).
+        on line 8 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2365.hrx b/spec/libsass-closed-issues/issue_2365.hrx
index 312e2152f9..d3ab3e0b1b 100644
--- a/spec/libsass-closed-issues/issue_2365.hrx
+++ b/spec/libsass-closed-issues/issue_2365.hrx
@@ -8,11 +8,6 @@ a {
     }
 }
 <===> error
-Error: Invalid CSS after "": expected selector, was ","
-        on line 4 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 4 |     },
diff --git a/spec/libsass-closed-issues/issue_2371.hrx b/spec/libsass-closed-issues/issue_2371.hrx
index 1de746193d..f1157838c3 100644
--- a/spec/libsass-closed-issues/issue_2371.hrx
+++ b/spec/libsass-closed-issues/issue_2371.hrx
@@ -2,14 +2,14 @@
 #{a==b}
 
 <===> error
-Error: Invalid CSS after "#{a==b}": expected "{", was ""
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "{".
   ,
 1 | #{a==b}
   |        ^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "#{a==b}": expected "{", was ""
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_238760.hrx b/spec/libsass-closed-issues/issue_238760.hrx
index f7216aa79f..3fceda3103 100644
--- a/spec/libsass-closed-issues/issue_238760.hrx
+++ b/spec/libsass-closed-issues/issue_238760.hrx
@@ -1,12 +1,6 @@
 <===> input.scss
 $id: inspect((a#b:c)...)
 <===> error
-Error: Variable keyword argument map must have string keys.
-       ("a" "#b") is not a string in (a #b: c).
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Variable keyword argument map must have string keys.
 a #b is not a string in (a #b: c).
   ,
@@ -14,3 +8,9 @@ a #b is not a string in (a #b: c).
   |              ^^^^^^^
   '
   input.scss 1:14  root stylesheet
+
+<===> error-libsass
+Error: Variable keyword argument map must have string keys.
+       ("a" "#b") is not a string in (a #b: c).
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_2446/error b/spec/libsass-closed-issues/issue_2446/error
index ecac703ef4..03f720a616 100644
--- a/spec/libsass-closed-issues/issue_2446/error
+++ b/spec/libsass-closed-issues/issue_2446/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\xE5"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | $�:D&(22#222222%0:/2222-2%22%222/2-2%22%2222-2%22%22)/22
+  |  ^
+  '
+  input.scss 1:2  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_2446/error-dart-sass b/spec/libsass-closed-issues/issue_2446/error-dart-sass
deleted file mode 100644
index 03f720a616..0000000000
--- a/spec/libsass-closed-issues/issue_2446/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | $�:D&(22#222222%0:/2222-2%22%222/2-2%22%2222-2%22%22)/22
-  |  ^
-  '
-  input.scss 1:2  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_245443/error b/spec/libsass-closed-issues/issue_245443/error
index 9f31517e0c..c82a5a53ce 100644
--- a/spec/libsass-closed-issues/issue_245443/error
+++ b/spec/libsass-closed-issues/issue_245443/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\x8A"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | @mfu�n pue0���� {�.\|,&
+  |     ^
+  '
+  input.scss 1:5  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_245443/error-dart-sass b/spec/libsass-closed-issues/issue_245443/error-dart-sass
deleted file mode 100644
index c82a5a53ce..0000000000
--- a/spec/libsass-closed-issues/issue_245443/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | @mfu�n pue0���� {�.\|,&
-  |     ^
-  '
-  input.scss 1:5  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_2465.hrx b/spec/libsass-closed-issues/issue_2465.hrx
index 734ff7414d..56079ac679 100644
--- a/spec/libsass-closed-issues/issue_2465.hrx
+++ b/spec/libsass-closed-issues/issue_2465.hrx
@@ -8,16 +8,16 @@ foo {
 
 <===> output.css
 foo {
-  a: 4e2px;
-  b: 5e-2px;
+  a: 400px;
+  b: 0.05px;
   c: 603px;
   d: 3.07px;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
-  a: 400px;
-  b: 0.05px;
+  a: 4e2px;
+  b: 5e-2px;
   c: 603px;
   d: 3.07px;
 }
diff --git a/spec/libsass-closed-issues/issue_2482.hrx b/spec/libsass-closed-issues/issue_2482.hrx
index a709758e06..9a3aa67984 100644
--- a/spec/libsass-closed-issues/issue_2482.hrx
+++ b/spec/libsass-closed-issues/issue_2482.hrx
@@ -9,17 +9,6 @@
 
 @include mixin();
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 3 of input.scss, in `mixin'
-        from line 9 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 9:10 of input.scss
->>      & .class
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 3 | /     & .class
@@ -28,3 +17,8 @@ Error: Top-level selectors may not contain the parent selector "&".
   '
   input.scss 3:2  mixin()
   input.scss 9:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 9:10 of input.scss
+>>      & .class
diff --git a/spec/libsass-closed-issues/issue_2569.hrx b/spec/libsass-closed-issues/issue_2569.hrx
index 896645daa7..5c8541970a 100644
--- a/spec/libsass-closed-issues/issue_2569.hrx
+++ b/spec/libsass-closed-issues/issue_2569.hrx
@@ -11,14 +11,14 @@
   opacity: test();
 }
 <===> error
-Error: Functions can only contain variable declarations and control directives.
-        on line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: @function rules may not contain declarations.
   ,
 5 |     opacity: 1;
   |     ^^^^^^^^^^
   '
   input.scss 5:5  root stylesheet
+
+<===> error-libsass
+Error: Functions can only contain variable declarations and control directives.
+        on line 5 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_308.hrx b/spec/libsass-closed-issues/issue_308.hrx
index 3ebf1fe84c..567e377d81 100644
--- a/spec/libsass-closed-issues/issue_308.hrx
+++ b/spec/libsass-closed-issues/issue_308.hrx
@@ -24,13 +24,6 @@ $var: orange;
 }
 
 <===> warning
-WARNING on line 7, column 2 of input.scss:
-You probably don't mean to use the color value `orange' in interpolation here.
-It may end up represented as #ffa500, which will likely produce invalid CSS.
-Always quote color names when using them as strings (for example, "orange").
-If you really want to use the color value here, use `"" + $var'.
-
-<===> warning-dart-sass
 WARNING: You probably don't mean to use the color value orange in interpolation here.
 It may end up represented as orange, which will likely produce invalid CSS.
 Always quote color names when using them as strings or map keys (for example, "orange").
diff --git a/spec/libsass-closed-issues/issue_309.hrx b/spec/libsass-closed-issues/issue_309.hrx
index 69e2fd17de..ad9c2a9bcb 100644
--- a/spec/libsass-closed-issues/issue_309.hrx
+++ b/spec/libsass-closed-issues/issue_309.hrx
@@ -2,11 +2,11 @@
 $zzz: zzz;
 a[data-foo="#{$zzz}"] { a: b; }
 <===> output.css
-a[data-foo="zzz"] {
+a[data-foo=zzz] {
   a: b;
 }
 
-<===> output-dart-sass.css
-a[data-foo=zzz] {
+<===> output-libsass.css
+a[data-foo="zzz"] {
   a: b;
 }
diff --git a/spec/libsass-closed-issues/issue_349.hrx b/spec/libsass-closed-issues/issue_349.hrx
index c4ea141e06..8af4e1e24d 100644
--- a/spec/libsass-closed-issues/issue_349.hrx
+++ b/spec/libsass-closed-issues/issue_349.hrx
@@ -5,10 +5,10 @@ div {
 
 <===> output.css
 div {
-  blah: not true;
+  blah: false;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
-  blah: false;
+  blah: not true;
 }
diff --git a/spec/libsass-closed-issues/issue_550/literal/dimension.hrx b/spec/libsass-closed-issues/issue_550/literal/dimension.hrx
index 3b3d826458..59e11bb0a8 100644
--- a/spec/libsass-closed-issues/issue_550/literal/dimension.hrx
+++ b/spec/libsass-closed-issues/issue_550/literal/dimension.hrx
@@ -33,13 +33,13 @@
 }
 
 #foo {
-  i: .0001px;
-  j: .01px;
-  k: -.0001px;
-  l: -.01px;
+  i: 0.0001px;
+  j: 0.01px;
+  k: -0.0001px;
+  l: -0.01px;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 #foo {
   i: 10.0001px;
   j: 10.01px;
@@ -55,8 +55,8 @@
 }
 
 #foo {
-  i: 0.0001px;
-  j: 0.01px;
-  k: -0.0001px;
-  l: -0.01px;
+  i: .0001px;
+  j: .01px;
+  k: -.0001px;
+  l: -.01px;
 }
diff --git a/spec/libsass-closed-issues/issue_550/literal/number.hrx b/spec/libsass-closed-issues/issue_550/literal/number.hrx
index 9ca3062727..0ea95ae4d5 100644
--- a/spec/libsass-closed-issues/issue_550/literal/number.hrx
+++ b/spec/libsass-closed-issues/issue_550/literal/number.hrx
@@ -33,13 +33,13 @@
 }
 
 #foo {
-  a: .0001;
-  b: .01;
-  c: -.0001;
-  d: -.01;
+  a: 0.0001;
+  b: 0.01;
+  c: -0.0001;
+  d: -0.01;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 #foo {
   a: 10.0001;
   b: 10.01;
@@ -55,8 +55,8 @@
 }
 
 #foo {
-  a: 0.0001;
-  b: 0.01;
-  c: -0.0001;
-  d: -0.01;
+  a: .0001;
+  b: .01;
+  c: -.0001;
+  d: -.01;
 }
diff --git a/spec/libsass-closed-issues/issue_550/literal/percent.hrx b/spec/libsass-closed-issues/issue_550/literal/percent.hrx
index d4a395b731..9d6229eb14 100644
--- a/spec/libsass-closed-issues/issue_550/literal/percent.hrx
+++ b/spec/libsass-closed-issues/issue_550/literal/percent.hrx
@@ -33,13 +33,13 @@
 }
 
 #foo {
-  e: .0001%;
-  f: .01%;
-  g: -.0001%;
-  h: -.01%;
+  e: 0.0001%;
+  f: 0.01%;
+  g: -0.0001%;
+  h: -0.01%;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 #foo {
   e: 10.0001%;
   f: 10.01%;
@@ -55,8 +55,8 @@
 }
 
 #foo {
-  e: 0.0001%;
-  f: 0.01%;
-  g: -0.0001%;
-  h: -0.01%;
+  e: .0001%;
+  f: .01%;
+  g: -.0001%;
+  h: -.01%;
 }
diff --git a/spec/libsass-closed-issues/issue_6.hrx b/spec/libsass-closed-issues/issue_6.hrx
index d97f14018d..9c928c74da 100644
--- a/spec/libsass-closed-issues/issue_6.hrx
+++ b/spec/libsass-closed-issues/issue_6.hrx
@@ -6,15 +6,15 @@
     margin-bottom: 5px;
     }
 <===> output.css
-*[class|="has-background"] {
+*[class|=has-background] {
   background: #efefef;
   padding: 7px;
   border: 1px solid #888;
   margin-bottom: 5px;
 }
 
-<===> output-dart-sass.css
-*[class|=has-background] {
+<===> output-libsass.css
+*[class|="has-background"] {
   background: #efefef;
   padding: 7px;
   border: 1px solid #888;
diff --git a/spec/libsass-closed-issues/issue_628.hrx b/spec/libsass-closed-issues/issue_628.hrx
index 9e24b8e1e1..9889b976b4 100644
--- a/spec/libsass-closed-issues/issue_628.hrx
+++ b/spec/libsass-closed-issues/issue_628.hrx
@@ -9,9 +9,6 @@ $map: (
   ),
 );
 <===> error
-Error: Duplicate key "eta" in map (eta: 5, eta: 6).
-
-<===> error-dart-sass
 Error: Duplicate key.
   ,
 6 |     eta: 5,
@@ -20,3 +17,6 @@ Error: Duplicate key.
   |     ^^^ second key
   '
   input.scss 7:5  root stylesheet
+
+<===> error-libsass
+Error: Duplicate key "eta" in map (eta: 5, eta: 6).
diff --git a/spec/libsass-closed-issues/issue_659/static.hrx b/spec/libsass-closed-issues/issue_659/static.hrx
index d9d5707a80..4c4d5868e1 100644
--- a/spec/libsass-closed-issues/issue_659/static.hrx
+++ b/spec/libsass-closed-issues/issue_659/static.hrx
@@ -27,6 +27,11 @@ bam {
 }
 
 <===> output.css
+baz {
+  baz: !important;
+}
+
+<===> output-libsass.css
 bam {
   bam: null;
 }
@@ -42,8 +47,3 @@ bar {
 baz {
   baz: null !important;
 }
-
-<===> output-dart-sass.css
-baz {
-  baz: !important;
-}
diff --git a/spec/libsass-closed-issues/issue_673.hrx b/spec/libsass-closed-issues/issue_673.hrx
index ecf931931c..3ab2f28aca 100644
--- a/spec/libsass-closed-issues/issue_673.hrx
+++ b/spec/libsass-closed-issues/issue_673.hrx
@@ -13,18 +13,6 @@
 
 }
 <===> error
-Error: You may not @extend an outer selector from within @media.
-       You may only @extend selectors within the same directive.
-       From "@extend .example" on line 9 of input.scss.
-
-<===> error-libsass
-Error: You may not @extend selectors across media queries.
-       Use "@extend .example !optional" to avoid this error.
-        on line 9 of input.scss
->>             @extend .example;
-   --------------------^
-
-<===> error-dart-sass
 Error: From line 1, column 1 of input.scss: 
   ,
 1 | .example {
@@ -36,3 +24,10 @@ You may not @extend selectors across media queries.
   |             ^^^^^^^^^^^^^^^^
   '
   input.scss 9:13  root stylesheet
+
+<===> error-libsass
+Error: You may not @extend selectors across media queries.
+       Use "@extend .example !optional" to avoid this error.
+        on line 9 of input.scss
+>>             @extend .example;
+   --------------------^
diff --git a/spec/libsass-closed-issues/issue_674.hrx b/spec/libsass-closed-issues/issue_674.hrx
index 6bea56bfdb..b522350319 100644
--- a/spec/libsass-closed-issues/issue_674.hrx
+++ b/spec/libsass-closed-issues/issue_674.hrx
@@ -27,15 +27,7 @@ div {
   }
 }
 
-<===> error-dart-sass
-Error: Invalid function name.
-  ,
-5 | @function url($src, $path:''){
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  '
-  input.scss 5:1  root stylesheet
-
-<===> output.css
+<===> output-libsass.css
 div {
   background: url(../images/image.png);
   background: url(../images/img/image.png);
@@ -53,3 +45,11 @@ div:after {
 DEPRECATION WARNING on line 5 of /sass/spec/libsass-issues/issue_674/input.scss:
 Naming a function "url" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
+
+<===> error
+Error: Invalid function name.
+  ,
+5 | @function url($src, $path:''){
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  '
+  input.scss 5:1  root stylesheet
diff --git a/spec/libsass-closed-issues/issue_701.hrx b/spec/libsass-closed-issues/issue_701.hrx
index dc78f7764a..b673bf527c 100644
--- a/spec/libsass-closed-issues/issue_701.hrx
+++ b/spec/libsass-closed-issues/issue_701.hrx
@@ -16,7 +16,6 @@
 
 <===> output.css
 .test-1 {
-  content: null;
   content: null;
   content: false;
   content: true;
@@ -28,8 +27,9 @@
   content: (a: 1, b: 2, c: 3);
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .test-1 {
+  content: null;
   content: null;
   content: false;
   content: true;
diff --git a/spec/libsass-closed-issues/issue_712.hrx b/spec/libsass-closed-issues/issue_712.hrx
index fdadb05a17..90bf5fbc27 100644
--- a/spec/libsass-closed-issues/issue_712.hrx
+++ b/spec/libsass-closed-issues/issue_712.hrx
@@ -10,20 +10,6 @@
 }
 
 <===> error
-Error: You may not @extend an outer selector from within @media.
-       You may only @extend selectors within the same directive.
-       From "@extend .foo" on line 7 of input.scss.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: You may not @extend selectors across media queries.
-       Use "@extend .foo !optional" to avoid this error.
-        on line 7 of input.scss
->>       @extend .foo;
-   --------------^
-
-<===> error-dart-sass
 Error: From line 1, column 1 of input.scss: 
   ,
 1 | .foo {
@@ -35,3 +21,10 @@ You may not @extend selectors across media queries.
   |     ^^^^^^^^^^^^
   '
   input.scss 7:5  root stylesheet
+
+<===> error-libsass
+Error: You may not @extend selectors across media queries.
+       Use "@extend .foo !optional" to avoid this error.
+        on line 7 of input.scss
+>>       @extend .foo;
+   --------------^
diff --git a/spec/libsass-closed-issues/issue_713/and.hrx b/spec/libsass-closed-issues/issue_713/and.hrx
index fa3cdfbcaf..07dc63d344 100644
--- a/spec/libsass-closed-issues/issue_713/and.hrx
+++ b/spec/libsass-closed-issues/issue_713/and.hrx
@@ -8,14 +8,14 @@ test {
 }
 
 <===> error
-Error: Invalid function name "and".
-        on line  of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Invalid function name.
   ,
 1 | @function and() {
   | ^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid function name "and".
+        on line  of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_713/not.hrx b/spec/libsass-closed-issues/issue_713/not.hrx
index d3e050557e..d1430ae4c5 100644
--- a/spec/libsass-closed-issues/issue_713/not.hrx
+++ b/spec/libsass-closed-issues/issue_713/not.hrx
@@ -8,14 +8,14 @@ test {
 }
 
 <===> error
-Error: Invalid function name "not".
-        on line  of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Invalid function name.
   ,
 1 | @function not() {
   | ^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid function name "not".
+        on line  of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_713/or.hrx b/spec/libsass-closed-issues/issue_713/or.hrx
index a33c386286..aa7788cd3e 100644
--- a/spec/libsass-closed-issues/issue_713/or.hrx
+++ b/spec/libsass-closed-issues/issue_713/or.hrx
@@ -8,14 +8,14 @@ test {
 }
 
 <===> error
-Error: Invalid function name "or".
-        on line  of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Invalid function name.
   ,
 1 | @function or() {
   | ^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid function name "or".
+        on line  of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-closed-issues/issue_72.hrx b/spec/libsass-closed-issues/issue_72.hrx
index 7fc230600f..f08cd29039 100644
--- a/spec/libsass-closed-issues/issue_72.hrx
+++ b/spec/libsass-closed-issues/issue_72.hrx
@@ -9,10 +9,10 @@ test {
 }
 <===> output.css
 test {
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#223344', endColorstr='#112233',GradientType=0 );
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr="#223344", endColorstr="#112233",GradientType=0 );
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 test {
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr="#223344", endColorstr="#112233",GradientType=0 );
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#223344', endColorstr='#112233',GradientType=0 );
 }
diff --git a/spec/libsass-closed-issues/issue_83.hrx b/spec/libsass-closed-issues/issue_83.hrx
index 5bc6b47e36..3c3e079cf2 100644
--- a/spec/libsass-closed-issues/issue_83.hrx
+++ b/spec/libsass-closed-issues/issue_83.hrx
@@ -11,9 +11,6 @@
   border-width: 10px;
 }
 <===> error
-Error: Mixin colors is missing argument $color.
-
-<===> error-dart-sass
 Error: Missing argument $color.
     ,
 1   | @mixin colors($color) {
@@ -24,3 +21,6 @@ Error: Missing argument $color.
     '
   input.scss 7:3  colors()
   input.scss 7:3  root stylesheet
+
+<===> error-libsass
+Error: Mixin colors is missing argument $color.
diff --git a/spec/libsass-closed-issues/issue_871.hrx b/spec/libsass-closed-issues/issue_871.hrx
index c93bd3dc2f..85b456dfd4 100644
--- a/spec/libsass-closed-issues/issue_871.hrx
+++ b/spec/libsass-closed-issues/issue_871.hrx
@@ -4,20 +4,6 @@
   color: green;
 }
 <===> error
-Error: ".bar" failed to @extend ".foo".
-       The selector ".foo" was not found.
-       Use "@extend .foo !optional" if the extend should be able to fail.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: The target selector was not found.
-       Use "@extend .foo !optional" to avoid this error.
-        on line 2 of input.scss
->>   @extend .foo;
-   ----------^
-
-<===> error-dart-sass
 Error: The target selector was not found.
 Use "@extend .foo !optional" to avoid this error.
   ,
@@ -25,3 +11,10 @@ Use "@extend .foo !optional" to avoid this error.
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: The target selector was not found.
+       Use "@extend .foo !optional" to avoid this error.
+        on line 2 of input.scss
+>>   @extend .foo;
+   ----------^
diff --git a/spec/libsass-closed-issues/issue_894.hrx b/spec/libsass-closed-issues/issue_894.hrx
index 90189bd76a..ea458355f0 100644
--- a/spec/libsass-closed-issues/issue_894.hrx
+++ b/spec/libsass-closed-issues/issue_894.hrx
@@ -7,14 +7,14 @@ a {
 }
 
 b {
-  content: 'something so I have a non-empty expected output';
+  content: "something so I have a non-empty expected output";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 a {
   /**/
 }
 
 b {
-  content: "something so I have a non-empty expected output";
+  content: 'something so I have a non-empty expected output';
 }
diff --git a/spec/libsass-closed-issues/issue_945.hrx b/spec/libsass-closed-issues/issue_945.hrx
index c3bad0f5aa..e72125784a 100644
--- a/spec/libsass-closed-issues/issue_945.hrx
+++ b/spec/libsass-closed-issues/issue_945.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "  d:": expected expression (e.g. 1px, bold), was "}"
-        on line 4 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 3 |   d:
   |     ^
   '
   input.scss 3:5  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "  d:": expected expression (e.g. 1px, bold), was "}"
+        on line 4 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_1096.hrx b/spec/libsass-todo-issues/issue_1096.hrx
index 4fa078c8bc..70b987abb2 100644
--- a/spec/libsass-todo-issues/issue_1096.hrx
+++ b/spec/libsass-todo-issues/issue_1096.hrx
@@ -7,15 +7,7 @@ bar");
 @import url(foo
 bar);
 
-<===> error-dart-sass
-Error: Expected ".
-  ,
-4 | @import url("foo
-  |                 ^
-  '
-  input.scss 4:17  root stylesheet
-
-<===> output.css
+<===> output-libsass.css
 @import url("foobar");
 @import url("foo\a bar");
 @import url(foo bar);
@@ -24,3 +16,11 @@ Error: Expected ".
 DEPRECATION WARNING on line 4, column 13 of input.scss:
 Unescaped multiline strings are deprecated and will be removed in a future version of Sass.
 To include a newline in a string, use "\a" or "\a " as in CSS.
+
+<===> error
+Error: Expected ".
+  ,
+4 | @import url("foo
+  |                 ^
+  '
+  input.scss 4:17  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_1694/quoted-right-dbl-paren.hrx b/spec/libsass-todo-issues/issue_1694/quoted-right-dbl-paren.hrx
index 568a2baa3f..c4dcb9831a 100644
--- a/spec/libsass-todo-issues/issue_1694/quoted-right-dbl-paren.hrx
+++ b/spec/libsass-todo-issues/issue_1694/quoted-right-dbl-paren.hrx
@@ -3,12 +3,12 @@ test {
   filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20\));
 }
 
-<===> error
-Error: Invalid CSS after "...ha(opacity=20\)": expected ";", was ");"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> output-dart-sass.css
+<===> output.css
 test {
   filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20\));
 }
+
+<===> error-libsass
+Error: Invalid CSS after "...ha(opacity=20\)": expected ";", was ");"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_1694/quoted-right-paren.hrx b/spec/libsass-todo-issues/issue_1694/quoted-right-paren.hrx
index 5d0d019dce..ef796a22a9 100644
--- a/spec/libsass-todo-issues/issue_1694/quoted-right-paren.hrx
+++ b/spec/libsass-todo-issues/issue_1694/quoted-right-paren.hrx
@@ -3,15 +3,15 @@ test {
   filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20\);
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+test {
+  filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20\);
+}
+
+<===> error
 Error: expected ")".
   ,
 2 |   filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20\);
   |                                                               ^
   '
   input.scss 2:63  root stylesheet
-
-<===> output.css
-test {
-  filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20\);
-}
diff --git a/spec/libsass-todo-issues/issue_1732/invalid/ruleset.hrx b/spec/libsass-todo-issues/issue_1732/invalid/ruleset.hrx
index 9fb58e78f2..927d65b204 100644
--- a/spec/libsass-todo-issues/issue_1732/invalid/ruleset.hrx
+++ b/spec/libsass-todo-issues/issue_1732/invalid/ruleset.hrx
@@ -2,14 +2,14 @@
 color: green;
 
 <===> error
-Error: Invalid CSS after "color: green": expected "{", was ";"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "{".
   ,
 1 | color: green;
   |             ^
   '
   input.scss 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "color: green": expected "{", was ";"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_1763.hrx b/spec/libsass-todo-issues/issue_1763.hrx
index 154e37b7cd..85f29b1480 100644
--- a/spec/libsass-todo-issues/issue_1763.hrx
+++ b/spec/libsass-todo-issues/issue_1763.hrx
@@ -1,23 +1,23 @@
-<===> first.scss
-foo { bar: baz }
-
 <===> input.scss
 @import "first.css", "second.css" (max-width: 400px);
 @import "first.scss", "second.scss" (max-width: 400px);
 
+<===> first.scss
+foo { bar: baz }
+
 <===> second.scss
 a { b: c }
 
 <===> output.css
-@import url(first.css);
+@import "first.css";
 @import "second.css" (max-width: 400px);
 @import "second.scss" (max-width: 400px);
 foo {
   bar: baz;
 }
 
-<===> output-dart-sass.css
-@import "first.css";
+<===> output-libsass.css
+@import url(first.css);
 @import "second.css" (max-width: 400px);
 @import "second.scss" (max-width: 400px);
 foo {
diff --git a/spec/libsass-todo-issues/issue_1801/simple-import-loop.hrx b/spec/libsass-todo-issues/issue_1801/simple-import-loop.hrx
index 5a39be436c..9267fb8c93 100644
--- a/spec/libsass-todo-issues/issue_1801/simple-import-loop.hrx
+++ b/spec/libsass-todo-issues/issue_1801/simple-import-loop.hrx
@@ -1,17 +1,10 @@
-<===> _susy.scss
+<===> input.scss
 @import 'susy';
 
-<===> input.scss
+<===> _susy.scss
 @import 'susy';
 
 <===> error
-Error: An @import loop has been found: _susy.scss imports itself
-        on line 1 of _susy.scss
-        from line 1 of _susy.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This file is already being loaded.
   ,--> _susy.scss
 1 | @import 'susy';
@@ -23,3 +16,10 @@ Error: This file is already being loaded.
   '
   _susy.scss 1:9  @import
   input.scss 1:9  root stylesheet
+
+<===> error-libsass
+Error: An @import loop has been found: _susy.scss imports itself
+        on line 1 of _susy.scss
+        from line 1 of _susy.scss
+        from line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_2016/error b/spec/libsass-todo-issues/issue_2016/error
index d664676001..8a53363356 100644
--- a/spec/libsass-todo-issues/issue_2016/error
+++ b/spec/libsass-todo-issues/issue_2016/error
@@ -1,3 +1,6 @@
-Error: Invalid CSS after "...pecific grammar": expected ")", was ". And this thin..."
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Expected identifier.
+  ,
+1 | $_: ___((Classes and IDs must follow a specific grammar. And this thing here doesn’t.));
+  |                                                         ^
+  '
+  input.scss 1:57  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_2016/error-dart-sass b/spec/libsass-todo-issues/issue_2016/error-dart-sass
deleted file mode 100644
index 8a53363356..0000000000
--- a/spec/libsass-todo-issues/issue_2016/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Expected identifier.
-  ,
-1 | $_: ___((Classes and IDs must follow a specific grammar. And this thing here doesn’t.));
-  |                                                         ^
-  '
-  input.scss 1:57  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_2016/error-libsass b/spec/libsass-todo-issues/issue_2016/error-libsass
new file mode 100644
index 0000000000..d664676001
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_2016/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid CSS after "...pecific grammar": expected ")", was ". And this thin..."
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_2023/class-selector-id.hrx b/spec/libsass-todo-issues/issue_2023/class-selector-id.hrx
index 7366053225..c8de9ecafb 100644
--- a/spec/libsass-todo-issues/issue_2023/class-selector-id.hrx
+++ b/spec/libsass-todo-issues/issue_2023/class-selector-id.hrx
@@ -4,12 +4,12 @@
 }
 
 <===> error
-Error: Invalid CSS after ".": expected class name, was "3c"
-
-<===> error-dart-sass
 Error: Expected identifier.
   ,
 1 | .3c{
   |  ^
   '
   input.scss 1:2  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after ".": expected class name, was "3c"
diff --git a/spec/libsass-todo-issues/issue_2023/class-selector-nr.hrx b/spec/libsass-todo-issues/issue_2023/class-selector-nr.hrx
index 43998f6d49..a3f3f7793f 100644
--- a/spec/libsass-todo-issues/issue_2023/class-selector-nr.hrx
+++ b/spec/libsass-todo-issues/issue_2023/class-selector-nr.hrx
@@ -4,12 +4,12 @@
 }
 
 <===> error
-Error: Invalid CSS after ".": expected class name, was "3"
-
-<===> error-dart-sass
 Error: Expected identifier.
   ,
 1 | .3{
   |  ^
   '
   input.scss 1:2  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after ".": expected class name, was "3"
diff --git a/spec/libsass-todo-issues/issue_2023/type-selector-id.hrx b/spec/libsass-todo-issues/issue_2023/type-selector-id.hrx
index fdb03723a2..a5676a4bd1 100644
--- a/spec/libsass-todo-issues/issue_2023/type-selector-id.hrx
+++ b/spec/libsass-todo-issues/issue_2023/type-selector-id.hrx
@@ -4,12 +4,12 @@
 }
 
 <===> error
-Error: Invalid CSS after "": expected selector, was "1a"
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 1 | 1a{
   | ^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was "1a"
diff --git a/spec/libsass-todo-issues/issue_2023/type-selector-nr.hrx b/spec/libsass-todo-issues/issue_2023/type-selector-nr.hrx
index 423b5ded26..95f453c8fd 100644
--- a/spec/libsass-todo-issues/issue_2023/type-selector-nr.hrx
+++ b/spec/libsass-todo-issues/issue_2023/type-selector-nr.hrx
@@ -4,12 +4,12 @@
 }
 
 <===> error
-Error: Invalid CSS after "": expected selector, was "1"
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 1 | 1{
   | ^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was "1"
diff --git a/spec/libsass-todo-issues/issue_2051.hrx b/spec/libsass-todo-issues/issue_2051.hrx
index 11df4b4868..c650652c97 100644
--- a/spec/libsass-todo-issues/issue_2051.hrx
+++ b/spec/libsass-todo-issues/issue_2051.hrx
@@ -13,13 +13,6 @@
     background: blue;
 }
 <===> error
-Error: ":global(.thing[disabled])" failed to @extend ".thing".
-       The selector ".thing" was not found.
-       Use "@extend .thing !optional" if the extend should be able to fail.
-        on line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: The target selector was not found.
 Use "@extend .thing !optional" to avoid this error.
   ,
@@ -27,3 +20,10 @@ Use "@extend .thing !optional" to avoid this error.
   |     ^^^^^^^^^^^^^^
   '
   input.scss 6:5  root stylesheet
+
+<===> error-libsass
+Error: ":global(.thing[disabled])" failed to @extend ".thing".
+       The selector ".thing" was not found.
+       Use "@extend .thing !optional" if the extend should be able to fail.
+        on line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_221260.hrx b/spec/libsass-todo-issues/issue_221260.hrx
index be08073f27..b18d40da04 100644
--- a/spec/libsass-todo-issues/issue_221260.hrx
+++ b/spec/libsass-todo-issues/issue_221260.hrx
@@ -1,14 +1,14 @@
 <===> input.scss
 @H#{[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[}
 <===> error
-Error: Invalid CSS after "@H#{": expected expression (e.g. 1px, bold), was "[[[[[[[[[[[[[[[..."
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @H#{[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[}
   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ^
   '
   input.scss 1:770  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@H#{": expected expression (e.g. 1px, bold), was "[[[[[[[[[[[[[[[..."
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_221267/error b/spec/libsass-todo-issues/issue_221267/error
index a9f7d59bd9..7b04d62364 100644
--- a/spec/libsass-todo-issues/issue_221267/error
+++ b/spec/libsass-todo-issues/issue_221267/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\xAD"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | @ph��#{I�wpl no�+H�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�e2��ght==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-t==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�igh+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-t==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight=6242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not  n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==29ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==29ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4, DDE�-, o�t==-�qt n�����me2�ight==242- not2�ight==244, DdE4�}��t6li�
+  |    ^
+  '
+  input.scss 1:4  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_221267/error-dart-sass b/spec/libsass-todo-issues/issue_221267/error-dart-sass
deleted file mode 100644
index 7b04d62364..0000000000
--- a/spec/libsass-todo-issues/issue_221267/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | @ph��#{I�wpl no�+H�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�e2��ght==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-t==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�igh+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-t==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight=6242- noot no�+Hight==242- not no�+H�c�+X�c9ri2�ig�re2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqtn�����me2�ight==242- ne2�ight==242-4, DdJ�-, o�t==-nqt n���2�ig�re2�ight==242-4, DdE�-, o�t==-nqt n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not  n�����me2�ight==242- not no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==29ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4+ not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==242- noot no�+Hight==242- not no�+H�c9ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4, DdE�-, o�t==-nqt n�����me2�ight==29ri2�ight==24Q, D��re2�ight==242- not no�+Hight!=242-+3not no�+H�c9ri=242-4, DDE�-, o�t==-�qt n�����me2�ight==242- not2�ight==244, DdE4�}��t6li�
-  |    ^
-  '
-  input.scss 1:4  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_221267/error-libsass b/spec/libsass-todo-issues/issue_221267/error-libsass
new file mode 100644
index 0000000000..a9f7d59bd9
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_221267/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid UTF-8 character "\xAD"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_221286/error b/spec/libsass-todo-issues/issue_221286/error
index 324e9a900a..5cabc6f1cb 100644
Binary files a/spec/libsass-todo-issues/issue_221286/error and b/spec/libsass-todo-issues/issue_221286/error differ
diff --git a/spec/libsass-todo-issues/issue_221286/error-dart-sass b/spec/libsass-todo-issues/issue_221286/error-dart-sass
deleted file mode 100644
index 5cabc6f1cb..0000000000
Binary files a/spec/libsass-todo-issues/issue_221286/error-dart-sass and /dev/null differ
diff --git a/spec/libsass-todo-issues/issue_221286/error-libsass b/spec/libsass-todo-issues/issue_221286/error-libsass
new file mode 100644
index 0000000000..324e9a900a
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_221286/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid UTF-8 character "\xD2"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_2295/error/basic.hrx b/spec/libsass-todo-issues/issue_2295/error/basic.hrx
index 7def085777..29f20260e9 100644
--- a/spec/libsass-todo-issues/issue_2295/error/basic.hrx
+++ b/spec/libsass-todo-issues/issue_2295/error/basic.hrx
@@ -1,17 +1,11 @@
-<===> include.scss
-display: none;
-
 <===> input.scss
 .my-scope {
   @import 'include.scss';
 }
-<===> error
-Error: Invalid CSS after "display: none": expected "{", was ";"
-        on line 1 of include.scss
-        from line 2 of input.scss
-  Use --trace for backtrace.
+<===> include.scss
+display: none;
 
-<===> error-dart-sass
+<===> error
 Error: expected "{".
   ,
 1 | display: none;
@@ -19,3 +13,9 @@ Error: expected "{".
   '
   include.scss 1:14  @import
   input.scss 2:11    root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "display: none": expected "{", was ";"
+        on line 1 of include.scss
+        from line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_2295/error/wrapped.hrx b/spec/libsass-todo-issues/issue_2295/error/wrapped.hrx
index 04953edf46..cc98409b60 100644
--- a/spec/libsass-todo-issues/issue_2295/error/wrapped.hrx
+++ b/spec/libsass-todo-issues/issue_2295/error/wrapped.hrx
@@ -1,18 +1,12 @@
-<===> include.scss
-@if (true) {
-  display: none;
-}
 <===> input.scss
 .my-scope {
   @import 'include.scss';
 }
+<===> include.scss
+@if (true) {
+  display: none;
+}
 <===> error
-Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
-        on line 2 of include.scss
-        from line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "{".
   ,
 2 |   display: none;
@@ -20,3 +14,9 @@ Error: expected "{".
   '
   include.scss 2:16  @import
   input.scss 2:11    root stylesheet
+
+<===> error-libsass
+Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
+        on line 2 of include.scss
+        from line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_238764.hrx b/spec/libsass-todo-issues/issue_238764.hrx
index 807bc2bc4f..56fe0dca25 100644
--- a/spec/libsass-todo-issues/issue_238764.hrx
+++ b/spec/libsass-todo-issues/issue_238764.hrx
@@ -7,12 +7,6 @@
   @include bar;
 }
 <===> error
-Error: Invalid CSS after "": expected selector, was "@bar"
-        on line 2 of input.scss, in `bar'
-        from line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 2 |   @at-root @bar{a: b}
@@ -20,3 +14,9 @@ Error: expected selector.
   '
   input.scss 2:12  bar()
   input.scss 6:3   root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was "@bar"
+        on line 2 of input.scss, in `bar'
+        from line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_245442/error b/spec/libsass-todo-issues/issue_245442/error
index 03281300c5..04225d265e 100644
--- a/spec/libsass-todo-issues/issue_245442/error
+++ b/spec/libsass-todo-issues/issue_245442/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\xDF"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | j,\|.-������>>>g>>>>>>>>>>>>>>>>>�sd>>>>��mixin�o%nsend R��mixinAo,ns()j*AJ�xte{
+  |       ^
+  '
+  input.scss 1:7  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_245442/error-dart-sass b/spec/libsass-todo-issues/issue_245442/error-dart-sass
deleted file mode 100644
index 04225d265e..0000000000
--- a/spec/libsass-todo-issues/issue_245442/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | j,\|.-������>>>g>>>>>>>>>>>>>>>>>�sd>>>>��mixin�o%nsend R��mixinAo,ns()j*AJ�xte{
-  |       ^
-  '
-  input.scss 1:7  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_245442/error-libsass b/spec/libsass-todo-issues/issue_245442/error-libsass
new file mode 100644
index 0000000000..03281300c5
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_245442/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid UTF-8 character "\xDF"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-issues/issue_245446/error b/spec/libsass-todo-issues/issue_245446/error
index 03281300c5..cc953ba619 100644
--- a/spec/libsass-todo-issues/issue_245446/error
+++ b/spec/libsass-todo-issues/issue_245446/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\xDF"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | j,\|.-��������mixin�o,ns()j*\|(tesR��mixi,ws)>J�{
+  |       ^
+  '
+  input.scss 1:7  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_245446/error-dart-sass b/spec/libsass-todo-issues/issue_245446/error-dart-sass
deleted file mode 100644
index cc953ba619..0000000000
--- a/spec/libsass-todo-issues/issue_245446/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | j,\|.-��������mixin�o,ns()j*\|(tesR��mixi,ws)>J�{
-  |       ^
-  '
-  input.scss 1:7  root stylesheet
diff --git a/spec/libsass-todo-issues/issue_245446/error-libsass b/spec/libsass-todo-issues/issue_245446/error-libsass
new file mode 100644
index 0000000000..03281300c5
--- /dev/null
+++ b/spec/libsass-todo-issues/issue_245446/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid UTF-8 character "\xDF"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-tests/errors/unicode/invalid/after/error b/spec/libsass-todo-tests/errors/unicode/invalid/after/error
index 74fd1ee316..50fbee991b 100644
--- a/spec/libsass-todo-tests/errors/unicode/invalid/after/error
+++ b/spec/libsass-todo-tests/errors/unicode/invalid/after/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\xF6"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | foo{;��������
+  |      ^
+  '
+  input.scss 1:6  root stylesheet
diff --git a/spec/libsass-todo-tests/errors/unicode/invalid/after/error-dart-sass b/spec/libsass-todo-tests/errors/unicode/invalid/after/error-dart-sass
deleted file mode 100644
index 50fbee991b..0000000000
--- a/spec/libsass-todo-tests/errors/unicode/invalid/after/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | foo{;��������
-  |      ^
-  '
-  input.scss 1:6  root stylesheet
diff --git a/spec/libsass-todo-tests/errors/unicode/invalid/after/error-libsass b/spec/libsass-todo-tests/errors/unicode/invalid/after/error-libsass
new file mode 100644
index 0000000000..74fd1ee316
--- /dev/null
+++ b/spec/libsass-todo-tests/errors/unicode/invalid/after/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid UTF-8 character "\xF6"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass-todo-tests/errors/unicode/invalid/before/error b/spec/libsass-todo-tests/errors/unicode/invalid/before/error
index 74fd1ee316..87ce97d56e 100644
--- a/spec/libsass-todo-tests/errors/unicode/invalid/before/error
+++ b/spec/libsass-todo-tests/errors/unicode/invalid/before/error
@@ -1,3 +1,6 @@
-Error: Invalid UTF-8 character "\xF6"
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: Invalid UTF-8.
+  ,
+1 | ��������{a:c
+  | ^
+  '
+  input.scss 1:1  root stylesheet
diff --git a/spec/libsass-todo-tests/errors/unicode/invalid/before/error-dart-sass b/spec/libsass-todo-tests/errors/unicode/invalid/before/error-dart-sass
deleted file mode 100644
index 87ce97d56e..0000000000
--- a/spec/libsass-todo-tests/errors/unicode/invalid/before/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: Invalid UTF-8.
-  ,
-1 | ��������{a:c
-  | ^
-  '
-  input.scss 1:1  root stylesheet
diff --git a/spec/libsass-todo-tests/errors/unicode/invalid/before/error-libsass b/spec/libsass-todo-tests/errors/unicode/invalid/before/error-libsass
new file mode 100644
index 0000000000..74fd1ee316
--- /dev/null
+++ b/spec/libsass-todo-tests/errors/unicode/invalid/before/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid UTF-8 character "\xF6"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/at-stuff.hrx b/spec/libsass/at-stuff.hrx
index 60f695d85f..6c532c0f8a 100644
--- a/spec/libsass/at-stuff.hrx
+++ b/spec/libsass/at-stuff.hrx
@@ -76,7 +76,7 @@ div {
     opacity: 0.5;
   }
   100% {
-    opacity: 1.0;
+    opacity: 1;
   }
 }
 @-webkit-keyframes BOUNCE {
@@ -87,6 +87,7 @@ div {
     left: 200px;
   }
 }
+
 div {
   border-upper-left: 10px;
   border-upper-right: 9px;
@@ -102,11 +103,11 @@ div span {
   color: blue;
 }
 @mudge div span, a:visited;
-@fu dge foo {
+@fudge foo {
   color: red;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @fudge hux bloo;
 div {
   color: red;
@@ -128,7 +129,7 @@ div {
     opacity: 0.5;
   }
   100% {
-    opacity: 1;
+    opacity: 1.0;
   }
 }
 @-webkit-keyframes BOUNCE {
@@ -139,7 +140,6 @@ div {
     left: 200px;
   }
 }
-
 div {
   border-upper-left: 10px;
   border-upper-right: 9px;
@@ -155,6 +155,6 @@ div span {
   color: blue;
 }
 @mudge div span, a:visited;
-@fudge foo {
+@fu dge foo {
   color: red;
 }
diff --git a/spec/libsass/base-level-parent/imported/at-root-alone-itpl.hrx b/spec/libsass/base-level-parent/imported/at-root-alone-itpl.hrx
index 3872231de6..6f324fc3aa 100644
--- a/spec/libsass/base-level-parent/imported/at-root-alone-itpl.hrx
+++ b/spec/libsass/base-level-parent/imported/at-root-alone-itpl.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 @at-root {
   #{&} {
@@ -7,15 +9,7 @@
   }
 }
 
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Invalid CSS after "": expected selector, was ""
-        on line 2 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 2 |   {
@@ -23,3 +17,9 @@ Error: expected selector.
   '
   include.scss 2:3  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was ""
+        on line 2 of include.scss
+        from line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/imported/at-root-alone.hrx b/spec/libsass/base-level-parent/imported/at-root-alone.hrx
index fed6984f9c..32b85ffe71 100644
--- a/spec/libsass/base-level-parent/imported/at-root-alone.hrx
+++ b/spec/libsass/base-level-parent/imported/at-root-alone.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 @at-root {
   & {
@@ -6,21 +8,7 @@
     }
   }
 }
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 2 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1:9 of input.scss
->>   & {
-   --^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 2 |   & {
@@ -28,3 +16,9 @@ Error: Top-level selectors may not contain the parent selector "&".
   '
   include.scss 2:3  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1:9 of input.scss
+>>   & {
+   --^
diff --git a/spec/libsass/base-level-parent/imported/at-root-postfix.hrx b/spec/libsass/base-level-parent/imported/at-root-postfix.hrx
index e5d12abf4d..82d019d1c4 100644
--- a/spec/libsass/base-level-parent/imported/at-root-postfix.hrx
+++ b/spec/libsass/base-level-parent/imported/at-root-postfix.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 @at-root {
   &post {
@@ -6,21 +8,7 @@
     }
   }
 }
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 2 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1:9 of input.scss
->>   &post {
-   --^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 2 |   &post {
@@ -28,3 +16,9 @@ Error: Top-level selectors may not contain the parent selector "&".
   '
   include.scss 2:3  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1:9 of input.scss
+>>   &post {
+   --^
diff --git a/spec/libsass/base-level-parent/imported/at-root-prefix.hrx b/spec/libsass/base-level-parent/imported/at-root-prefix.hrx
index 90feb162dc..0e71cc6565 100644
--- a/spec/libsass/base-level-parent/imported/at-root-prefix.hrx
+++ b/spec/libsass/base-level-parent/imported/at-root-prefix.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 @at-root {
   pre& {
@@ -6,17 +8,7 @@
     }
   }
 }
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Invalid CSS after "pre": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 2 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 2 |   pre&{
@@ -24,3 +16,11 @@ Error: "&" may only used at the beginning of a compound selector.
   '
   include.scss 2:6  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "pre": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 2 of include.scss
+        from line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/imported/basic-alone-itpl.hrx b/spec/libsass/base-level-parent/imported/basic-alone-itpl.hrx
index 1967ad8777..b30cfc63f8 100644
--- a/spec/libsass/base-level-parent/imported/basic-alone-itpl.hrx
+++ b/spec/libsass/base-level-parent/imported/basic-alone-itpl.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 #{&} {
   foo {
@@ -5,15 +7,7 @@
   }
 }
 
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Invalid CSS after "": expected selector, was ""
-        on line 1 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 1 | {
@@ -21,3 +15,9 @@ Error: expected selector.
   '
   include.scss 1:1  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was ""
+        on line 1 of include.scss
+        from line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/imported/basic-alone.hrx b/spec/libsass/base-level-parent/imported/basic-alone.hrx
index a13f0aadb0..de1004e730 100644
--- a/spec/libsass/base-level-parent/imported/basic-alone.hrx
+++ b/spec/libsass/base-level-parent/imported/basic-alone.hrx
@@ -1,3 +1,5 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 & {
   foo {
@@ -5,20 +7,7 @@
   }
 }
 
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1:9 of input.scss
->> & {
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | & {
@@ -26,3 +15,8 @@ Error: Top-level selectors may not contain the parent selector "&".
   '
   include.scss 1:1  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1:9 of input.scss
+>> & {
diff --git a/spec/libsass/base-level-parent/imported/basic-postfix.hrx b/spec/libsass/base-level-parent/imported/basic-postfix.hrx
index 78c9b99fd2..5453a4f434 100644
--- a/spec/libsass/base-level-parent/imported/basic-postfix.hrx
+++ b/spec/libsass/base-level-parent/imported/basic-postfix.hrx
@@ -1,23 +1,12 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 &post {
   foo {
     bar: baz;
   }
 }
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1:9 of input.scss
->> &post {
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | &post {
@@ -25,3 +14,8 @@ Error: Top-level selectors may not contain the parent selector "&".
   '
   include.scss 1:1  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1:9 of input.scss
+>> &post {
diff --git a/spec/libsass/base-level-parent/imported/basic-prefix.hrx b/spec/libsass/base-level-parent/imported/basic-prefix.hrx
index 5982279c11..962ca6e8da 100644
--- a/spec/libsass/base-level-parent/imported/basic-prefix.hrx
+++ b/spec/libsass/base-level-parent/imported/basic-prefix.hrx
@@ -1,20 +1,12 @@
+<===> input.scss
+@import "include.scss";
 <===> include.scss
 pre& {
   foo {
     bar: baz;
   }
 }
-<===> input.scss
-@import "include.scss";
 <===> error
-Error: Invalid CSS after "pre": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 1 of include.scss
-        from line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 1 | pre&{
@@ -22,3 +14,11 @@ Error: "&" may only used at the beginning of a compound selector.
   '
   include.scss 1:4  @import
   input.scss 1:9    root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "pre": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 1 of include.scss
+        from line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/nested/at-root-prefix.hrx b/spec/libsass/base-level-parent/nested/at-root-prefix.hrx
index c0d8d5ca05..045760caf4 100644
--- a/spec/libsass/base-level-parent/nested/at-root-prefix.hrx
+++ b/spec/libsass/base-level-parent/nested/at-root-prefix.hrx
@@ -9,16 +9,16 @@ test{
   }
 }
 <===> error
-Error: Invalid CSS after "pre": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 3 |     pre&{
   |        ^
   '
   input.scss 3:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "pre": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/nested/basic-prefix.hrx b/spec/libsass/base-level-parent/nested/basic-prefix.hrx
index 886a3f0d75..7dd0bb6fe2 100644
--- a/spec/libsass/base-level-parent/nested/basic-prefix.hrx
+++ b/spec/libsass/base-level-parent/nested/basic-prefix.hrx
@@ -7,16 +7,16 @@ test {
   }
 }
 <===> error
-Error: Invalid CSS after "pre": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 2 of /sass/spec/libsass/base-level-parent/nested/prefix/input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 2 |   pre&{
   |      ^
   '
   input.scss 2:6  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "pre": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 2 of /sass/spec/libsass/base-level-parent/nested/prefix/input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/root/at-root-alone-itpl.hrx b/spec/libsass/base-level-parent/root/at-root-alone-itpl.hrx
index e8c109203c..97b35f0ea8 100644
--- a/spec/libsass/base-level-parent/root/at-root-alone-itpl.hrx
+++ b/spec/libsass/base-level-parent/root/at-root-alone-itpl.hrx
@@ -8,14 +8,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "": expected selector, was ""
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 2 |   {
   |   ^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was ""
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/root/at-root-alone.hrx b/spec/libsass/base-level-parent/root/at-root-alone.hrx
index fa81b4a39e..1d743079e7 100644
--- a/spec/libsass/base-level-parent/root/at-root-alone.hrx
+++ b/spec/libsass/base-level-parent/root/at-root-alone.hrx
@@ -7,20 +7,15 @@
   }
 }
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 2 of input.scss
->>     & {
-   ----^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 2 |   & {
   |   ^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 2 of input.scss
+>>     & {
+   ----^
diff --git a/spec/libsass/base-level-parent/root/at-root-postfix.hrx b/spec/libsass/base-level-parent/root/at-root-postfix.hrx
index 248a8fd59d..b81e0c2d9b 100644
--- a/spec/libsass/base-level-parent/root/at-root-postfix.hrx
+++ b/spec/libsass/base-level-parent/root/at-root-postfix.hrx
@@ -7,20 +7,15 @@
   }
 }
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 2 of input.scss
->>     &post {
-   ----^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 2 |   &post {
   |   ^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 2 of input.scss
+>>     &post {
+   ----^
diff --git a/spec/libsass/base-level-parent/root/at-root-prefix.hrx b/spec/libsass/base-level-parent/root/at-root-prefix.hrx
index 0a39cda9aa..b01a14a87a 100644
--- a/spec/libsass/base-level-parent/root/at-root-prefix.hrx
+++ b/spec/libsass/base-level-parent/root/at-root-prefix.hrx
@@ -7,16 +7,16 @@
   }
 }
 <===> error
-Error: Invalid CSS after "pre": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 2 |   pre&{
   |      ^
   '
   input.scss 2:6  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "pre": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/root/basic-alone-itpl.hrx b/spec/libsass/base-level-parent/root/basic-alone-itpl.hrx
index b91a7f21c2..148dfd4562 100644
--- a/spec/libsass/base-level-parent/root/basic-alone-itpl.hrx
+++ b/spec/libsass/base-level-parent/root/basic-alone-itpl.hrx
@@ -6,14 +6,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "": expected selector, was ""
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 1 | {
   | ^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected selector, was ""
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/base-level-parent/root/basic-alone.hrx b/spec/libsass/base-level-parent/root/basic-alone.hrx
index 0586e54e6a..5a156ccc94 100644
--- a/spec/libsass/base-level-parent/root/basic-alone.hrx
+++ b/spec/libsass/base-level-parent/root/basic-alone.hrx
@@ -6,19 +6,14 @@
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1 of input.scss
->> & {
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | & {
   | ^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1 of input.scss
+>> & {
diff --git a/spec/libsass/base-level-parent/root/basic-postfix.hrx b/spec/libsass/base-level-parent/root/basic-postfix.hrx
index 7ecb26878f..072b7652af 100644
--- a/spec/libsass/base-level-parent/root/basic-postfix.hrx
+++ b/spec/libsass/base-level-parent/root/basic-postfix.hrx
@@ -5,19 +5,14 @@
   }
 }
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 1 of input.scss
->> &post {
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
   ,
 1 | &post {
   | ^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 1 of input.scss
+>> &post {
diff --git a/spec/libsass/base-level-parent/root/basic-prefix.hrx b/spec/libsass/base-level-parent/root/basic-prefix.hrx
index 0d6a89b706..a539fe64d0 100644
--- a/spec/libsass/base-level-parent/root/basic-prefix.hrx
+++ b/spec/libsass/base-level-parent/root/basic-prefix.hrx
@@ -5,16 +5,16 @@ pre& {
   }
 }
 <===> error
-Error: Invalid CSS after "pre": expected "{", was "&"
-       
-       "&" may only be used at the beginning of a compound selector.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "&" may only used at the beginning of a compound selector.
   ,
 1 | pre&{
   |    ^
   '
   input.scss 1:4  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "pre": expected "{", was "&"
+       
+       "&" may only be used at the beginning of a compound selector.
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/bool.hrx b/spec/libsass/bool.hrx
index c437d60467..2e2bf0e78a 100644
--- a/spec/libsass/bool.hrx
+++ b/spec/libsass/bool.hrx
@@ -12,17 +12,17 @@ div {
   a: false;
   b: "ho";
   b: "hey";
-  a: false and "hey";
-  b: "hey" and "ho";
+  a: false;
+  b: "ho";
   b: hey;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   a: false;
   b: "ho";
   b: "hey";
-  a: false;
-  b: "ho";
+  a: false and "hey";
+  b: "hey" and "ho";
   b: hey;
 }
diff --git a/spec/libsass/bourbon.hrx b/spec/libsass/bourbon.hrx
index 670aa30b51..1b6dd7cc30 100644
--- a/spec/libsass/bourbon.hrx
+++ b/spec/libsass/bourbon.hrx
@@ -1918,15 +1918,15 @@ div {
   /* boo boo boo */
   background-image: url("/images/a.png"), url("images/b.png");
   background-image: url("/images/a.png"), url("images/b.png");
-  background-image: url("/images/a.png"), -webkit-linear-gradient( white 0, yellow 50%, transparent 50%);
+  background-image: url("/images/a.png"), -webkit-linear-gradient(white 0, yellow 50%, transparent 50%);
   background-image: url("/images/a.png"), linear-gradient( white 0, yellow 50%, transparent 50%);
-  background-image: -webkit-linear-gradient( rgba(255, 255, 255, 0.25) 0%, rgba(255, 255, 255, 0.08) 50%, transparent 50%), -webkit-linear-gradient( #4e7ba3, #3e6181);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.25) 0%, rgba(255, 255, 255, 0.08) 50%, transparent 50%), -webkit-linear-gradient(#4e7ba3, #3e6181);
   background-image: linear-gradient( rgba(255, 255, 255, 0.25) 0%, rgba(255, 255, 255, 0.08) 50%, transparent 50%), linear-gradient( #4e7ba3, #3e6181);
-  background-image: -webkit-url("/images/a.png")-gradient( center), -webkit-url("images/b.png")-gradient( left);
+  background-image: -webkit-url("/images/a.png")-gradient(center), -webkit-url("images/b.png")-gradient(left);
   background-image: url("/images/a.png")-gradient( center), url("images/b.png")-gradient( left);
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 box:hover {
   -webkit-animation-name: scale, slide;
   -moz-animation-name: scale, slide;
@@ -1954,10 +1954,10 @@ div {
   /* boo boo boo */
   background-image: url("/images/a.png"), url("images/b.png");
   background-image: url("/images/a.png"), url("images/b.png");
-  background-image: url("/images/a.png"), -webkit-linear-gradient(white 0, yellow 50%, transparent 50%);
+  background-image: url("/images/a.png"), -webkit-linear-gradient( white 0, yellow 50%, transparent 50%);
   background-image: url("/images/a.png"), linear-gradient( white 0, yellow 50%, transparent 50%);
-  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.25) 0%, rgba(255, 255, 255, 0.08) 50%, transparent 50%), -webkit-linear-gradient(#4e7ba3, #3e6181);
+  background-image: -webkit-linear-gradient( rgba(255, 255, 255, 0.25) 0%, rgba(255, 255, 255, 0.08) 50%, transparent 50%), -webkit-linear-gradient( #4e7ba3, #3e6181);
   background-image: linear-gradient( rgba(255, 255, 255, 0.25) 0%, rgba(255, 255, 255, 0.08) 50%, transparent 50%), linear-gradient( #4e7ba3, #3e6181);
-  background-image: -webkit-url("/images/a.png")-gradient(center), -webkit-url("images/b.png")-gradient(left);
+  background-image: -webkit-url("/images/a.png")-gradient( center), -webkit-url("images/b.png")-gradient( left);
   background-image: url("/images/a.png")-gradient( center), url("images/b.png")-gradient( left);
 }
diff --git a/spec/libsass/color-functions/other/change-color/h.hrx b/spec/libsass/color-functions/other/change-color/h.hrx
index 127518a4ca..469b0feb61 100644
--- a/spec/libsass/color-functions/other/change-color/h.hrx
+++ b/spec/libsass/color-functions/other/change-color/h.hrx
@@ -547,7 +547,7 @@ foo {
   c177: #00fff2;
   c178: #00fff7;
   c179: #00fffb;
-  c180: cyan;
+  c180: aqua;
   c181: #00fbff;
   c182: #00f7ff;
   c183: #00f2ff;
@@ -667,7 +667,7 @@ foo {
   c297: #f200ff;
   c298: #f700ff;
   c299: #fb00ff;
-  c300: magenta;
+  c300: fuchsia;
   c301: #ff00fb;
   c302: #ff00f7;
   c303: #ff00f2;
@@ -730,7 +730,7 @@ foo {
   c360: red;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   c-1: #ff0004;
   c0: red;
@@ -913,7 +913,7 @@ foo {
   c177: #00fff2;
   c178: #00fff7;
   c179: #00fffb;
-  c180: aqua;
+  c180: cyan;
   c181: #00fbff;
   c182: #00f7ff;
   c183: #00f2ff;
@@ -1033,7 +1033,7 @@ foo {
   c297: #f200ff;
   c298: #f700ff;
   c299: #fb00ff;
-  c300: fuchsia;
+  c300: magenta;
   c301: #ff00fb;
   c302: #ff00f7;
   c303: #ff00f2;
diff --git a/spec/libsass/css-import.hrx b/spec/libsass/css-import.hrx
index a4fc348c38..38c4c236d5 100644
--- a/spec/libsass/css-import.hrx
+++ b/spec/libsass/css-import.hrx
@@ -5,15 +5,15 @@ div {
   color: red;
 }
 <===> output.css
-@import url(foo.css);
-@import url(bar.css);
+@import 'foo.css';
+@import "bar.css";
 div {
   color: red;
 }
 
-<===> output-dart-sass.css
-@import 'foo.css';
-@import "bar.css";
+<===> output-libsass.css
+@import url(foo.css);
+@import url(bar.css);
 div {
   color: red;
 }
diff --git a/spec/libsass/css_nth_selectors.hrx b/spec/libsass/css_nth_selectors.hrx
index 4b88ea2fab..db85e41edd 100644
--- a/spec/libsass/css_nth_selectors.hrx
+++ b/spec/libsass/css_nth_selectors.hrx
@@ -9,19 +9,19 @@
 }
 
 <===> output.css
-:nth-child(2n + 3) {
+:nth-child(2n+3) {
   outer-whitespace: false;
 }
 
-:nth-child(2n + 3) {
+:nth-child(2n+3) {
   outer-whitespace: true;
 }
 
-<===> output-dart-sass.css
-:nth-child(2n+3) {
+<===> output-libsass.css
+:nth-child(2n + 3) {
   outer-whitespace: false;
 }
 
-:nth-child(2n+3) {
+:nth-child(2n + 3) {
   outer-whitespace: true;
 }
diff --git a/spec/libsass/debug-directive-nested/function.hrx b/spec/libsass/debug-directive-nested/function.hrx
index 5055401fb9..08e34ba503 100644
--- a/spec/libsass/debug-directive-nested/function.hrx
+++ b/spec/libsass/debug-directive-nested/function.hrx
@@ -16,10 +16,10 @@ a {
 }
 
 <===> warning
-WARNING: test
-         on line 2 of input.scss
-
-<===> warning-dart-sass
 WARNING: test
     input.scss 2:3  c()
     input.scss 8:8  root stylesheet
+
+<===> warning-libsass
+WARNING: test
+         on line 2 of input.scss
diff --git a/spec/libsass/debug-directive-nested/inline.hrx b/spec/libsass/debug-directive-nested/inline.hrx
index 69f7107a11..c7137a0f8d 100644
--- a/spec/libsass/debug-directive-nested/inline.hrx
+++ b/spec/libsass/debug-directive-nested/inline.hrx
@@ -1,3 +1,7 @@
+<===> options.yml
+:warning_todo:
+  - libsass
+
 <===> input.scss
 a {
   b: {
@@ -6,15 +10,15 @@ a {
   }
 }
 
-<===> error
-Error: Illegal nesting: Only properties may be nested beneath properties.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> output-dart-sass.css
+<===> output.css
 a {
   b-c: d;
 }
 
-<===> warning-dart-sass
+<===> warning
 spec/libsass/debug-directive-nested/inline-dart-sass/input.scss:3 DEBUG: test
+
+<===> error-libsass
+Error: Illegal nesting: Only properties may be nested beneath properties.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/debug-directive-nested/mixin.hrx b/spec/libsass/debug-directive-nested/mixin.hrx
index 5f14e93cfd..5032e3fa2f 100644
--- a/spec/libsass/debug-directive-nested/mixin.hrx
+++ b/spec/libsass/debug-directive-nested/mixin.hrx
@@ -16,11 +16,11 @@ a {
 }
 
 <===> warning
-WARNING: test
-         on line 2 of input.scss, in `c'
-         from line 8 of input.scss
-
-<===> warning-dart-sass
 WARNING: test
     input.scss 2:3  c()
     input.scss 8:5  root stylesheet
+
+<===> warning-libsass
+WARNING: test
+         on line 2 of input.scss, in `c'
+         from line 8 of input.scss
diff --git a/spec/libsass/error-directive-nested/function.hrx b/spec/libsass/error-directive-nested/function.hrx
index aeff0f2ef8..c425f90cf6 100644
--- a/spec/libsass/error-directive-nested/function.hrx
+++ b/spec/libsass/error-directive-nested/function.hrx
@@ -11,14 +11,14 @@ a {
 }
 
 <===> error
-Error: test
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: test
   ,
 8 |     c: c();
   |        ^^^
   '
   input.scss 8:8  root stylesheet
+
+<===> error-libsass
+Error: test
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/error-directive-nested/inline.hrx b/spec/libsass/error-directive-nested/inline.hrx
index 910ec0c6cd..89b7d14242 100644
--- a/spec/libsass/error-directive-nested/inline.hrx
+++ b/spec/libsass/error-directive-nested/inline.hrx
@@ -7,14 +7,14 @@ a {
 }
 
 <===> error
-Error: Illegal nesting: Only properties may be nested beneath properties.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: test
   ,
 3 |     @error test;
   |     ^^^^^^^^^^^
   '
   input.scss 3:5  root stylesheet
+
+<===> error-libsass
+Error: Illegal nesting: Only properties may be nested beneath properties.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/error-directive-nested/mixin.hrx b/spec/libsass/error-directive-nested/mixin.hrx
index e004b3d1b4..32caab838e 100644
--- a/spec/libsass/error-directive-nested/mixin.hrx
+++ b/spec/libsass/error-directive-nested/mixin.hrx
@@ -11,15 +11,15 @@ a {
 }
 
 <===> error
-Error: test
-        on line 2 of input.scss, in `c'
-        from line 8 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: test
   ,
 8 |     @include c();
   |     ^^^^^^^^^^^^
   '
   input.scss 8:5  root stylesheet
+
+<===> error-libsass
+Error: test
+        on line 2 of input.scss, in `c'
+        from line 8 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/libsass/import.hrx b/spec/libsass/import.hrx
index d2565cd2a1..e15d329b77 100644
--- a/spec/libsass/import.hrx
+++ b/spec/libsass/import.hrx
@@ -8,16 +8,6 @@ div[name="hello"] {
 
 @import "bludge.css";
 <===> output.css
-@import url(hey1.css);
-@import url(cookie.css);
-@import url("hey2.css");
-@import url(fudge.css);
-@import url(bludge.css);
-div[name="hello"] {
-  color: blue;
-}
-
-<===> output-dart-sass.css
 @import "hey1.css";
 @import "cookie.css";
 @import url("hey2.css");
@@ -26,3 +16,13 @@ div[name="hello"] {
 div[name=hello] {
   color: blue;
 }
+
+<===> output-libsass.css
+@import url(hey1.css);
+@import url(cookie.css);
+@import url("hey2.css");
+@import url(fudge.css);
+@import url(bludge.css);
+div[name="hello"] {
+  color: blue;
+}
diff --git a/spec/libsass/keyframes.hrx b/spec/libsass/keyframes.hrx
index 711019edfb..0107af793c 100644
--- a/spec/libsass/keyframes.hrx
+++ b/spec/libsass/keyframes.hrx
@@ -46,7 +46,7 @@ div {
     opacity: 0;
   }
   50% {
-    opacity: .5;
+    opacity: 0.5;
   }
   100% {
     opacity: 1;
@@ -67,7 +67,7 @@ foo div {
   color: red;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   color: #181818;
 }
@@ -77,7 +77,7 @@ div {
     opacity: 0;
   }
   50% {
-    opacity: 0.5;
+    opacity: .5;
   }
   100% {
     opacity: 1;
diff --git a/spec/libsass/parent-selector/missing.hrx b/spec/libsass/parent-selector/missing.hrx
index ab1ed79aa1..6b90a58381 100644
--- a/spec/libsass/parent-selector/missing.hrx
+++ b/spec/libsass/parent-selector/missing.hrx
@@ -35,20 +35,6 @@ $grid-breakpoints-immobile: (
 }
 
 <===> error
-Error: Base-level rules cannot contain the parent-selector-referencing character '&'.
-        on line 30 of /sass/spec/parent-selector/missing/input.scss, in `@content'
-        from line 22 of /sass/spec/parent-selector/missing/input.scss, in `grid-media-query'
-        from line 29 of /sass/spec/parent-selector/missing/input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: Top-level selectors may not contain the parent selector "&".
-        on line 22:9 of input.scss, in mixin `grid-media-query`
-        from line 29:12 of input.scss
->>     body.immobile & {
-   ----^
-
-<===> error-dart-sass
 Error: Top-level selectors may not contain the parent selector "&".
    ,
 30 |     body.immobile & {
@@ -57,3 +43,10 @@ Error: Top-level selectors may not contain the parent selector "&".
   input.scss 30:5  @content
   input.scss 22:9  grid-media-query()
   input.scss 29:3  root stylesheet
+
+<===> error-libsass
+Error: Top-level selectors may not contain the parent selector "&".
+        on line 22:9 of input.scss, in mixin `grid-media-query`
+        from line 29:12 of input.scss
+>>     body.immobile & {
+   ----^
diff --git a/spec/libsass/precision/lower.hrx b/spec/libsass/precision/lower.hrx
index b7b781e595..1c3243c877 100644
--- a/spec/libsass/precision/lower.hrx
+++ b/spec/libsass/precision/lower.hrx
@@ -11,13 +11,13 @@ test {
 <===> output.css
 test {
   foo: 0.4999 0;
-  bar: 0.5 0;
-  baz: 0.5 1;
+  bar: 0.49999 0;
+  baz: 0.499999 0;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 test {
   foo: 0.4999 0;
-  bar: 0.49999 0;
-  baz: 0.499999 0;
+  bar: 0.5 0;
+  baz: 0.5 1;
 }
diff --git a/spec/libsass/properties-in-media.hrx b/spec/libsass/properties-in-media.hrx
index 9193fe15e6..fecee8ba5d 100644
--- a/spec/libsass/properties-in-media.hrx
+++ b/spec/libsass/properties-in-media.hrx
@@ -12,15 +12,7 @@
   color: blue;
   color: yellow;
 }
-<===> error-dart-sass
-Error: expected "{".
-  ,
-3 |   color: red;
-  |             ^
-  '
-  input.scss 3:13  root stylesheet
-
-<===> output.css
+<===> output-libsass.css
 @media only screen {
   /* asd */
   color: red;
@@ -35,3 +27,11 @@ Error: expected "{".
   color: blue;
   color: yellow;
 }
+
+<===> error
+Error: expected "{".
+  ,
+3 |   color: red;
+  |             ^
+  '
+  input.scss 3:13  root stylesheet
diff --git a/spec/libsass/propsets.hrx b/spec/libsass/propsets.hrx
index e13aa9cf78..13d46e3050 100644
--- a/spec/libsass/propsets.hrx
+++ b/spec/libsass/propsets.hrx
@@ -98,9 +98,5 @@ d\ v a, sp\ n a {
 }
 
 <===> warning
-WARNING: 5
-         on line 28 of input.scss
-
-<===> warning-dart-sass
 WARNING: 5
     input.scss 28:1  root stylesheet
diff --git a/spec/libsass/rel.hrx b/spec/libsass/rel.hrx
index 9042b836b8..8da9993f7e 100644
--- a/spec/libsass/rel.hrx
+++ b/spec/libsass/rel.hrx
@@ -40,7 +40,7 @@ div {
   eq: false;
   eq: true;
   x: 1in, 1in;
-  y: 1cm;
+  y: 0.3937007874in;
   eq: true;
   blah: 0.3937007874;
   in: 2.54cm;
@@ -49,7 +49,7 @@ div {
   lt: false;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   less: true;
   less: 0.75;
@@ -63,7 +63,7 @@ div {
   eq: false;
   eq: true;
   x: 1in, 1in;
-  y: 0.3937007874in;
+  y: 1cm;
   eq: true;
   blah: 0.3937007874;
   in: 2.54cm;
diff --git a/spec/libsass/test.hrx b/spec/libsass/test.hrx
index bae00085f6..40d095e169 100644
--- a/spec/libsass/test.hrx
+++ b/spec/libsass/test.hrx
@@ -87,12 +87,12 @@ h1:lang(en) {
 <===> output.css
 div {
   noo: false;
-  poo: not 3;
+  poo: false;
   doo: false;
   goo: false;
   zoo: false2;
   roo: false;
-  hoo: not not not 3;
+  hoo: false;
 }
 
 span {
@@ -149,15 +149,15 @@ h1:lang(en) {
   foo: bar;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   noo: false;
-  poo: false;
+  poo: not 3;
   doo: false;
   goo: false;
   zoo: false2;
   roo: false;
-  hoo: false;
+  hoo: not not not 3;
 }
 
 span {
diff --git a/spec/libsass/unary-ops.hrx b/spec/libsass/unary-ops.hrx
index da029fa20b..6d20627dff 100644
--- a/spec/libsass/unary-ops.hrx
+++ b/spec/libsass/unary-ops.hrx
@@ -17,7 +17,7 @@ div {
 div {
   a: -10;
   b: 0px;
-  c: +10;
+  c: 10;
   d: 0px;
   e: -20%;
   f: 20%;
@@ -27,11 +27,11 @@ div {
   j: string;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   a: -10;
   b: 0px;
-  c: 10;
+  c: +10;
   d: 0px;
   e: -20%;
   f: 20%;
diff --git a/spec/libsass/units/simple.hrx b/spec/libsass/units/simple.hrx
index c2d3e5229d..e63cb6a8ce 100644
--- a/spec/libsass/units/simple.hrx
+++ b/spec/libsass/units/simple.hrx
@@ -12,18 +12,18 @@ div {
 }
 <===> output.css
 div {
-  hey: 5150.9186351706in;
+  hey: 370866.1417322835pt;
   ho: true;
-  hoo: "px/emu*fu*gnu";
-  hee: "/cm";
+  hoo: "px/fu*emu*gnu";
+  hee: "cm^-1";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
-  hey: 370866.1417322835pt;
+  hey: 5150.9186351706in;
   ho: true;
-  hoo: "px/fu*emu*gnu";
-  hee: "cm^-1";
+  hoo: "px/emu*fu*gnu";
+  hee: "/cm";
 }
 
 <===> warning
diff --git a/spec/libsass/warn-directive-nested/function.hrx b/spec/libsass/warn-directive-nested/function.hrx
index 5055401fb9..08e34ba503 100644
--- a/spec/libsass/warn-directive-nested/function.hrx
+++ b/spec/libsass/warn-directive-nested/function.hrx
@@ -16,10 +16,10 @@ a {
 }
 
 <===> warning
-WARNING: test
-         on line 2 of input.scss
-
-<===> warning-dart-sass
 WARNING: test
     input.scss 2:3  c()
     input.scss 8:8  root stylesheet
+
+<===> warning-libsass
+WARNING: test
+         on line 2 of input.scss
diff --git a/spec/libsass/warn-directive-nested/mixin.hrx b/spec/libsass/warn-directive-nested/mixin.hrx
index 5f14e93cfd..5032e3fa2f 100644
--- a/spec/libsass/warn-directive-nested/mixin.hrx
+++ b/spec/libsass/warn-directive-nested/mixin.hrx
@@ -16,11 +16,11 @@ a {
 }
 
 <===> warning
-WARNING: test
-         on line 2 of input.scss, in `c'
-         from line 8 of input.scss
-
-<===> warning-dart-sass
 WARNING: test
     input.scss 2:3  c()
     input.scss 8:5  root stylesheet
+
+<===> warning-libsass
+WARNING: test
+         on line 2 of input.scss, in `c'
+         from line 8 of input.scss
diff --git a/spec/non_conformant/basic/11_attribute_selectors.hrx b/spec/non_conformant/basic/11_attribute_selectors.hrx
index 4e8b628b03..51dd9d28a1 100644
--- a/spec/non_conformant/basic/11_attribute_selectors.hrx
+++ b/spec/non_conformant/basic/11_attribute_selectors.hrx
@@ -6,17 +6,17 @@
   }
 }
 <===> output.css
-[hey='ho'], a > b {
+[hey=ho], a > b {
   blah: blah;
 }
-[hey='ho'] c, [hey='ho'] [hoo*="ha"], a > b c, a > b [hoo*="ha"] {
+[hey=ho] c, [hey=ho] [hoo*=ha], a > b c, a > b [hoo*=ha] {
   bloo: bloo;
 }
 
-<===> output-dart-sass.css
-[hey=ho], a > b {
+<===> output-libsass.css
+[hey='ho'], a > b {
   blah: blah;
 }
-[hey=ho] c, [hey=ho] [hoo*=ha], a > b c, a > b [hoo*=ha] {
+[hey='ho'] c, [hey='ho'] [hoo*="ha"], a > b c, a > b [hoo*="ha"] {
   bloo: bloo;
 }
diff --git a/spec/non_conformant/basic/15_arithmetic_and_lists.hrx b/spec/non_conformant/basic/15_arithmetic_and_lists.hrx
index bb90c5f5dd..4b741ec5fa 100644
--- a/spec/non_conformant/basic/15_arithmetic_and_lists.hrx
+++ b/spec/non_conformant/basic/15_arithmetic_and_lists.hrx
@@ -56,7 +56,7 @@ div {
   f: 123 4 5 6;
   g: 1114/7 8 9 6;
   /* shouldn't perform the following division */
-  h: 15 / 3 / 5;
+  h: 15/3/5;
   /* should perform the following division now */
   i: 1;
   /* this too */
@@ -78,7 +78,7 @@ div {
   zero-mod-zero: NaN;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   a: 3;
   b: 3.75;
@@ -90,7 +90,7 @@ div {
   f: 123 4 5 6;
   g: 1114/7 8 9 6;
   /* shouldn't perform the following division */
-  h: 15/3/5;
+  h: 15 / 3 / 5;
   /* should perform the following division now */
   i: 1;
   /* this too */
diff --git a/spec/non_conformant/basic/22_colors_with_alpha.hrx b/spec/non_conformant/basic/22_colors_with_alpha.hrx
index 912eee0f38..ca6fc2cbe5 100644
--- a/spec/non_conformant/basic/22_colors_with_alpha.hrx
+++ b/spec/non_conformant/basic/22_colors_with_alpha.hrx
@@ -28,9 +28,9 @@ div {
   background: #7b2d06;
   grah: rgba(255, 0, 238, 0.5);
   blah: rgba(1, 2, 3, 0.6);
-  floo: cyan;
+  floo: aqua;
   bloo: rgba(0, 255, 255, 0.7);
-  groo: cyan;
+  groo: aqua;
   hoo: 123;
   moo: 45;
   poo: 6;
@@ -38,15 +38,15 @@ div {
   boo: #edcba9;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   color: yellow;
   background: #7b2d06;
   grah: rgba(255, 0, 238, 0.5);
   blah: rgba(1, 2, 3, 0.6);
-  floo: aqua;
+  floo: cyan;
   bloo: rgba(0, 255, 255, 0.7);
-  groo: aqua;
+  groo: cyan;
   hoo: 123;
   moo: 45;
   poo: 6;
diff --git a/spec/non_conformant/basic/39_dash_match_attribute_selector.hrx b/spec/non_conformant/basic/39_dash_match_attribute_selector.hrx
index 12366b8a72..fc2a46ad89 100644
--- a/spec/non_conformant/basic/39_dash_match_attribute_selector.hrx
+++ b/spec/non_conformant/basic/39_dash_match_attribute_selector.hrx
@@ -3,11 +3,11 @@ div[class|="blah"] {
   color: blue;
 }
 <===> output.css
-div[class|="blah"] {
+div[class|=blah] {
   color: blue;
 }
 
-<===> output-dart-sass.css
-div[class|=blah] {
+<===> output-libsass.css
+div[class|="blah"] {
   color: blue;
 }
diff --git a/spec/non_conformant/basic/42_css_imports.hrx b/spec/non_conformant/basic/42_css_imports.hrx
index 6e287b5679..33902d3ef4 100644
--- a/spec/non_conformant/basic/42_css_imports.hrx
+++ b/spec/non_conformant/basic/42_css_imports.hrx
@@ -12,9 +12,9 @@ span {
 
 @import "bar.css";
 <===> output.css
-@import url(hux bux.css);
-@import url(foo.css);
-@import url(bar.css);
+@import "hux\ bux.css";
+@import "foo.css";
+@import "bar.css";
 div {
   color: red;
 }
@@ -23,10 +23,10 @@ span {
   color: blue;
 }
 
-<===> output-dart-sass.css
-@import "hux\ bux.css";
-@import "foo.css";
-@import "bar.css";
+<===> output-libsass.css
+@import url(hux bux.css);
+@import url(foo.css);
+@import url(bar.css);
 div {
   color: red;
 }
diff --git a/spec/non_conformant/basic/53_escaped_quotes/output-dart-sass.css b/spec/non_conformant/basic/53_escaped_quotes/output-dart-sass.css
deleted file mode 100644
index c8269f85b2..0000000000
--- a/spec/non_conformant/basic/53_escaped_quotes/output-dart-sass.css
+++ /dev/null
@@ -1,36 +0,0 @@
-@charset "UTF-8";
-[data-icon=test-1]:before {
-  content: "\\";
-}
-
-[data-icon=test-2]:before {
-  content: "'";
-}
-
-[data-icon=test-3]:before {
-  content: '"';
-}
-
-[data-icon=test-4]:before {
-  content: "\\";
-}
-
-[data-icon=test-5]:before {
-  content: "'";
-}
-
-[data-icon=test-6]:before {
-  content: '"';
-}
-
-.émotion {
-  blah: hi;
-}
-
-.édition {
-  blah: hi;
-}
-
-.édition {
-  blah: hi;
-}
diff --git a/spec/non_conformant/basic/53_escaped_quotes/output-libsass.css b/spec/non_conformant/basic/53_escaped_quotes/output-libsass.css
new file mode 100644
index 0000000000..4daf5a4402
--- /dev/null
+++ b/spec/non_conformant/basic/53_escaped_quotes/output-libsass.css
@@ -0,0 +1,36 @@
+@charset "UTF-8";
+[data-icon='test-1']:before {
+  content: '\\';
+}
+
+[data-icon='test-2']:before {
+  content: '\'';
+}
+
+[data-icon='test-3']:before {
+  content: "\"";
+}
+
+[data-icon='test-4']:before {
+  content: '\\';
+}
+
+[data-icon='test-5']:before {
+  content: '\'';
+}
+
+[data-icon='test-6']:before {
+  content: "\"";
+}
+
+.émotion {
+  blah: hi;
+}
+
+.édition {
+  blah: hi;
+}
+
+.édition {
+  blah: hi;
+}
diff --git a/spec/non_conformant/basic/53_escaped_quotes/output.css b/spec/non_conformant/basic/53_escaped_quotes/output.css
index 4daf5a4402..c8269f85b2 100644
--- a/spec/non_conformant/basic/53_escaped_quotes/output.css
+++ b/spec/non_conformant/basic/53_escaped_quotes/output.css
@@ -1,26 +1,26 @@
 @charset "UTF-8";
-[data-icon='test-1']:before {
-  content: '\\';
+[data-icon=test-1]:before {
+  content: "\\";
 }
 
-[data-icon='test-2']:before {
-  content: '\'';
+[data-icon=test-2]:before {
+  content: "'";
 }
 
-[data-icon='test-3']:before {
-  content: "\"";
+[data-icon=test-3]:before {
+  content: '"';
 }
 
-[data-icon='test-4']:before {
-  content: '\\';
+[data-icon=test-4]:before {
+  content: "\\";
 }
 
-[data-icon='test-5']:before {
-  content: '\'';
+[data-icon=test-5]:before {
+  content: "'";
 }
 
-[data-icon='test-6']:before {
-  content: "\"";
+[data-icon=test-6]:before {
+  content: '"';
 }
 
 .émotion {
diff --git a/spec/non_conformant/errors/extend/placeholder/missing.hrx b/spec/non_conformant/errors/extend/placeholder/missing.hrx
index 4fcab57171..d12f429392 100644
--- a/spec/non_conformant/errors/extend/placeholder/missing.hrx
+++ b/spec/non_conformant/errors/extend/placeholder/missing.hrx
@@ -5,20 +5,6 @@
 }
 
 <===> error
-Error: ".baz" failed to @extend "%foo".
-       The selector "%foo" was not found.
-       Use "@extend %foo !optional" if the extend should be able to fail.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: The target selector was not found.
-       Use "@extend %foo !optional" to avoid this error.
-        on line 2 of input.scss
->>     @extend %foo;
-   ------------^
-
-<===> error-dart-sass
 Error: The target selector was not found.
 Use "@extend %foo !optional" to avoid this error.
   ,
@@ -26,3 +12,10 @@ Use "@extend %foo !optional" to avoid this error.
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: The target selector was not found.
+       Use "@extend %foo !optional" to avoid this error.
+        on line 2 of input.scss
+>>     @extend %foo;
+   ------------^
diff --git a/spec/non_conformant/errors/extend/selector/missing.hrx b/spec/non_conformant/errors/extend/selector/missing.hrx
index 26f12d6501..6f64543606 100644
--- a/spec/non_conformant/errors/extend/selector/missing.hrx
+++ b/spec/non_conformant/errors/extend/selector/missing.hrx
@@ -5,20 +5,6 @@
 }
 
 <===> error
-Error: ".baz" failed to @extend ".foo".
-       The selector ".foo" was not found.
-       Use "@extend .foo !optional" if the extend should be able to fail.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-libsass
-Error: The target selector was not found.
-       Use "@extend .foo !optional" to avoid this error.
-        on line 2 of input.scss
->>     @extend .foo;
-   ------------^
-
-<===> error-dart-sass
 Error: The target selector was not found.
 Use "@extend .foo !optional" to avoid this error.
   ,
@@ -26,3 +12,10 @@ Use "@extend .foo !optional" to avoid this error.
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: The target selector was not found.
+       Use "@extend .foo !optional" to avoid this error.
+        on line 2 of input.scss
+>>     @extend .foo;
+   ------------^
diff --git a/spec/non_conformant/errors/fn-change-color-1.hrx b/spec/non_conformant/errors/fn-change-color-1.hrx
index 542f7b8459..b634dacd26 100644
--- a/spec/non_conformant/errors/fn-change-color-1.hrx
+++ b/spec/non_conformant/errors/fn-change-color-1.hrx
@@ -3,14 +3,14 @@ foo {
   test: change-color(red, $red: 0.5, $hue: 0.2);
 }
 <===> error
-Error: Cannot specify HSL and RGB values for a color at the same time for `change-color'
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: RGB parameters may not be passed along with HSL parameters.
   ,
 2 |   test: change-color(red, $red: 0.5, $hue: 0.2);
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:9  root stylesheet
+
+<===> error-libsass
+Error: Cannot specify HSL and RGB values for a color at the same time for `change-color'
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/fn-debug/property.hrx b/spec/non_conformant/errors/fn-debug/property.hrx
index ca7d02a17f..9543bead35 100644
--- a/spec/non_conformant/errors/fn-debug/property.hrx
+++ b/spec/non_conformant/errors/fn-debug/property.hrx
@@ -1,3 +1,7 @@
+<===> options.yml
+:warning_todo:
+  - libsass
+
 <===> input.scss
 a {
   b: {
@@ -5,15 +9,15 @@ a {
     foo: bar;
   }
 }
-<===> error
-Error: Illegal nesting: Only properties may be nested beneath properties.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> output-dart-sass.css
+<===> output.css
 a {
   b-foo: bar;
 }
 
-<===> warning-dart-sass
+<===> warning
 spec/errors/fn-debug/property-dart-sass/input.scss:3 DEBUG: debug
+
+<===> error-libsass
+Error: Illegal nesting: Only properties may be nested beneath properties.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/fn-error/property.hrx b/spec/non_conformant/errors/fn-error/property.hrx
index ba15197d5f..fa83894eba 100644
--- a/spec/non_conformant/errors/fn-error/property.hrx
+++ b/spec/non_conformant/errors/fn-error/property.hrx
@@ -6,14 +6,14 @@ a {
   }
 }
 <===> error
-Error: Illegal nesting: Only properties may be nested beneath properties.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "error"
   ,
 3 |     @error "error";
   |     ^^^^^^^^^^^^^^
   '
   input.scss 3:5  root stylesheet
+
+<===> error-libsass
+Error: Illegal nesting: Only properties may be nested beneath properties.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/fn-error/ruleset.hrx b/spec/non_conformant/errors/fn-error/ruleset.hrx
index 6a02ccda3c..6dba840cdc 100644
--- a/spec/non_conformant/errors/fn-error/ruleset.hrx
+++ b/spec/non_conformant/errors/fn-error/ruleset.hrx
@@ -4,14 +4,14 @@ a {
   foo: bar;
 }
 <===> error
-Error: error
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "error"
   ,
 2 |   @error "error";
   |   ^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: error
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/fn-error/simple.hrx b/spec/non_conformant/errors/fn-error/simple.hrx
index adb3ceea3c..e82d774a35 100644
--- a/spec/non_conformant/errors/fn-error/simple.hrx
+++ b/spec/non_conformant/errors/fn-error/simple.hrx
@@ -1,14 +1,14 @@
 <===> input.scss
 @error "error";
 <===> error
-Error: error
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "error"
   ,
 1 | @error "error";
   | ^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: error
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/fn-saturate-out-of-range.hrx b/spec/non_conformant/errors/fn-saturate-out-of-range.hrx
index 7647965077..d8861128d5 100644
--- a/spec/non_conformant/errors/fn-saturate-out-of-range.hrx
+++ b/spec/non_conformant/errors/fn-saturate-out-of-range.hrx
@@ -3,11 +3,6 @@ foo {
   bar: saturate(red, 125);
 }
 <===> error
-Error: Amount 125 must be between 0% and 100% for `saturate'
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: $amount: Expected 125 to be within 0 and 100.
   ,
 2 |   bar: saturate(red, 125);
diff --git a/spec/non_conformant/errors/fn-varargs/at-start.hrx b/spec/non_conformant/errors/fn-varargs/at-start.hrx
index 51d0a59d96..6f95eeb0c6 100644
--- a/spec/non_conformant/errors/fn-varargs/at-start.hrx
+++ b/spec/non_conformant/errors/fn-varargs/at-start.hrx
@@ -1,11 +1,6 @@
 <===> input.scss
 @function test($rest...,$param) {}
 <===> error
-Error: Invalid CSS after "...n test($rest...": expected ")", was ",$param) {}"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | @function test($rest...,$param) {}
diff --git a/spec/non_conformant/errors/fn-varargs/multiple.hrx b/spec/non_conformant/errors/fn-varargs/multiple.hrx
index d046fe38bb..8de8930d9e 100644
--- a/spec/non_conformant/errors/fn-varargs/multiple.hrx
+++ b/spec/non_conformant/errors/fn-varargs/multiple.hrx
@@ -1,11 +1,6 @@
 <===> input.scss
 @function test($param...,$rest...) {}
 <===> error
-Error: Invalid CSS after "... test($param...": expected ")", was ",$rest...) {}"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | @function test($param...,$rest...) {}
diff --git a/spec/non_conformant/errors/fn-varargs/with-default.hrx b/spec/non_conformant/errors/fn-varargs/with-default.hrx
index fc39dbcfd6..068f9d8254 100644
--- a/spec/non_conformant/errors/fn-varargs/with-default.hrx
+++ b/spec/non_conformant/errors/fn-varargs/with-default.hrx
@@ -1,11 +1,6 @@
 <===> input.scss
 @function test($param...:"default") {}
 <===> error
-Error: Invalid CSS after "... test($param...": expected ")", was ":"default") {}"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | @function test($param...:"default") {}
diff --git a/spec/non_conformant/errors/fn-warn/property.hrx b/spec/non_conformant/errors/fn-warn/property.hrx
index 70d140b012..33e023bb61 100644
--- a/spec/non_conformant/errors/fn-warn/property.hrx
+++ b/spec/non_conformant/errors/fn-warn/property.hrx
@@ -1,3 +1,7 @@
+<===> options.yml
+:warning_todo:
+  - libsass
+
 <===> input.scss
 a {
   b: {
@@ -5,16 +9,16 @@ a {
     foo: bar;
   }
 }
-<===> error
-Error: Illegal nesting: Only properties may be nested beneath properties.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> output-dart-sass.css
+<===> output.css
 a {
   b-foo: bar;
 }
 
-<===> warning-dart-sass
+<===> warning
 WARNING: warn
     input.scss 3:5  root stylesheet
+
+<===> error-libsass
+Error: Illegal nesting: Only properties may be nested beneath properties.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/fn-warn/ruleset.hrx b/spec/non_conformant/errors/fn-warn/ruleset.hrx
index 33e0eae51b..c45ddebd92 100644
--- a/spec/non_conformant/errors/fn-warn/ruleset.hrx
+++ b/spec/non_conformant/errors/fn-warn/ruleset.hrx
@@ -10,8 +10,8 @@ a {
 
 <===> warning
 WARNING: warn
-         on line 2 of input.scss
+    input.scss 2:3  root stylesheet
 
-<===> warning-dart-sass
+<===> warning-libsass
 WARNING: warn
-    input.scss 2:3  root stylesheet
+         on line 2 of input.scss
diff --git a/spec/non_conformant/errors/fn-warn/simple.hrx b/spec/non_conformant/errors/fn-warn/simple.hrx
index cc995fef7f..1ae3f84e64 100644
--- a/spec/non_conformant/errors/fn-warn/simple.hrx
+++ b/spec/non_conformant/errors/fn-warn/simple.hrx
@@ -1,10 +1,11 @@
 <===> input.scss
 @warn "warn";
 <===> output.css
+
 <===> warning
 WARNING: warn
-         on line 1 of input.scss
+    input.scss 1:1  root stylesheet
 
-<===> warning-dart-sass
+<===> warning-libsass
 WARNING: warn
-    input.scss 1:1  root stylesheet
+         on line 1 of input.scss
diff --git a/spec/non_conformant/errors/import/file/control-else.hrx b/spec/non_conformant/errors/import/file/control-else.hrx
index e2498cde89..89da16a9ee 100644
--- a/spec/non_conformant/errors/import/file/control-else.hrx
+++ b/spec/non_conformant/errors/import/file/control-else.hrx
@@ -1,19 +1,20 @@
-<===> _include.scss
 <===> input.scss
 @if (false) {
 } @else {
   @import '_include';
 }
 
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 3 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 3:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/control-if.hrx b/spec/non_conformant/errors/import/file/control-if.hrx
index 5094dda8ac..be339c86bd 100644
--- a/spec/non_conformant/errors/import/file/control-if.hrx
+++ b/spec/non_conformant/errors/import/file/control-if.hrx
@@ -1,18 +1,19 @@
-<===> _include.scss
 <===> input.scss
 @if (true) {
   @import '_include';
 }
 
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/loop/each.hrx b/spec/non_conformant/errors/import/file/loop/each.hrx
index b8bb3a5bf2..987581883d 100644
--- a/spec/non_conformant/errors/import/file/loop/each.hrx
+++ b/spec/non_conformant/errors/import/file/loop/each.hrx
@@ -1,18 +1,19 @@
-<===> _include.scss
 <===> input.scss
 @each $i in (1) {
   @import '_include';
 }
 
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/loop/for.hrx b/spec/non_conformant/errors/import/file/loop/for.hrx
index 5714074ce9..d608035019 100644
--- a/spec/non_conformant/errors/import/file/loop/for.hrx
+++ b/spec/non_conformant/errors/import/file/loop/for.hrx
@@ -1,18 +1,19 @@
-<===> _include.scss
 <===> input.scss
 @for $i from 1 through 2 {
   @import '_include';
 }
 
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/loop/while.hrx b/spec/non_conformant/errors/import/file/loop/while.hrx
index 6d117248e7..985f17e2bb 100644
--- a/spec/non_conformant/errors/import/file/loop/while.hrx
+++ b/spec/non_conformant/errors/import/file/loop/while.hrx
@@ -1,4 +1,3 @@
-<===> _include.scss
 <===> input.scss
 $count: 0;
 @while ($count < 1) {
@@ -6,15 +5,17 @@ $count: 0;
   $count: $count + 1;
 }
 
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 3 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 3:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/mixin/control-else/inside.hrx b/spec/non_conformant/errors/import/file/mixin/control-else/inside.hrx
index 64cf13d322..f2d415535f 100644
--- a/spec/non_conformant/errors/import/file/mixin/control-else/inside.hrx
+++ b/spec/non_conformant/errors/import/file/mixin/control-else/inside.hrx
@@ -1,4 +1,3 @@
-<===> _include.scss
 <===> input.scss
 @mixin do_import() {
   @if (false) {
@@ -10,15 +9,17 @@
 foo {
   @include do_import();
 }
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 4 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 4 |     @import '_include';
   |     ^^^^^^^^^^^^^^^^^^
   '
   input.scss 4:5  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 4 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/mixin/control-else/outside.hrx b/spec/non_conformant/errors/import/file/mixin/control-else/outside.hrx
index 950d0105a5..bb6202fe50 100644
--- a/spec/non_conformant/errors/import/file/mixin/control-else/outside.hrx
+++ b/spec/non_conformant/errors/import/file/mixin/control-else/outside.hrx
@@ -1,4 +1,3 @@
-<===> _include.scss
 <===> input.scss
 @mixin do_import() {
   @import '_include';
@@ -9,15 +8,17 @@
   @include do_import();
 }
 
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/mixin/control-if/inside.hrx b/spec/non_conformant/errors/import/file/mixin/control-if/inside.hrx
index fa72270b48..68934e382d 100644
--- a/spec/non_conformant/errors/import/file/mixin/control-if/inside.hrx
+++ b/spec/non_conformant/errors/import/file/mixin/control-if/inside.hrx
@@ -1,4 +1,3 @@
-<===> _include.scss
 <===> input.scss
 @mixin do_import() {
   @if (true) {
@@ -9,15 +8,17 @@
 foo {
   @include do_import();
 }
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 3 |     @import '_include';
   |     ^^^^^^^^^^^^^^^^^^
   '
   input.scss 3:5  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/mixin/control-if/outside.hrx b/spec/non_conformant/errors/import/file/mixin/control-if/outside.hrx
index 80f6e8cfae..9ac0627627 100644
--- a/spec/non_conformant/errors/import/file/mixin/control-if/outside.hrx
+++ b/spec/non_conformant/errors/import/file/mixin/control-if/outside.hrx
@@ -1,4 +1,3 @@
-<===> _include.scss
 <===> input.scss
 @mixin do_import() {
   @import '_include';
@@ -7,15 +6,17 @@
 @if (true) {
   @include do_import();
 }
-<===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/mixin/simple/inside.hrx b/spec/non_conformant/errors/import/file/mixin/simple/inside.hrx
index 762d0382db..ff9dddedb5 100644
--- a/spec/non_conformant/errors/import/file/mixin/simple/inside.hrx
+++ b/spec/non_conformant/errors/import/file/mixin/simple/inside.hrx
@@ -1,4 +1,3 @@
-<===> _include.scss
 <===> input.scss
 @mixin import-google-fonts() {
   @import url("http://fonts.googleapis.com/css?family=#{$family}");
@@ -7,13 +6,9 @@ foo {
   $family: unquote("Droid+Sans");
   @include import-google-fonts();
 }
-<===> error
-Error: Undefined variable: "$family".
-        on line 2 of input.scss, in `import-google-fonts'
-        from line 6 of input.scss
-  Use --trace for backtrace.
+<===> _include.scss
 
-<===> error-dart-sass
+<===> error
 Error: Undefined variable.
   ,
 2 |   @import url("http://fonts.googleapis.com/css?family=#{$family}");
@@ -21,3 +16,9 @@ Error: Undefined variable.
   '
   input.scss 2:57  import-google-fonts()
   input.scss 6:3   root stylesheet
+
+<===> error-libsass
+Error: Undefined variable: "$family".
+        on line 2 of input.scss, in `import-google-fonts'
+        from line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/file/simple.hrx b/spec/non_conformant/errors/import/file/simple.hrx
index d2565cd2a1..e15d329b77 100644
--- a/spec/non_conformant/errors/import/file/simple.hrx
+++ b/spec/non_conformant/errors/import/file/simple.hrx
@@ -8,16 +8,6 @@ div[name="hello"] {
 
 @import "bludge.css";
 <===> output.css
-@import url(hey1.css);
-@import url(cookie.css);
-@import url("hey2.css");
-@import url(fudge.css);
-@import url(bludge.css);
-div[name="hello"] {
-  color: blue;
-}
-
-<===> output-dart-sass.css
 @import "hey1.css";
 @import "cookie.css";
 @import url("hey2.css");
@@ -26,3 +16,13 @@ div[name="hello"] {
 div[name=hello] {
   color: blue;
 }
+
+<===> output-libsass.css
+@import url(hey1.css);
+@import url(cookie.css);
+@import url("hey2.css");
+@import url(fudge.css);
+@import url(bludge.css);
+div[name="hello"] {
+  color: blue;
+}
diff --git a/spec/non_conformant/errors/import/miss/control-else.hrx b/spec/non_conformant/errors/import/miss/control-else.hrx
index d5b70731b9..4b672f54f9 100644
--- a/spec/non_conformant/errors/import/miss/control-else.hrx
+++ b/spec/non_conformant/errors/import/miss/control-else.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 3 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 3:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/control-if.hrx b/spec/non_conformant/errors/import/miss/control-if.hrx
index 68990102c8..c6dae8979b 100644
--- a/spec/non_conformant/errors/import/miss/control-if.hrx
+++ b/spec/non_conformant/errors/import/miss/control-if.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/loop/each.hrx b/spec/non_conformant/errors/import/miss/loop/each.hrx
index ba65db0c6d..8f5505fd03 100644
--- a/spec/non_conformant/errors/import/miss/loop/each.hrx
+++ b/spec/non_conformant/errors/import/miss/loop/each.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/loop/for.hrx b/spec/non_conformant/errors/import/miss/loop/for.hrx
index e5fc163410..c1c7b1ef2f 100644
--- a/spec/non_conformant/errors/import/miss/loop/for.hrx
+++ b/spec/non_conformant/errors/import/miss/loop/for.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/loop/while.hrx b/spec/non_conformant/errors/import/miss/loop/while.hrx
index dd742b67ec..a9ef7ed328 100644
--- a/spec/non_conformant/errors/import/miss/loop/while.hrx
+++ b/spec/non_conformant/errors/import/miss/loop/while.hrx
@@ -6,14 +6,14 @@ $count: 0;
 }
 
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 3 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 3:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/mixin/control-else/inside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-else/inside.hrx
index 8b4e2ca120..b50fc96201 100644
--- a/spec/non_conformant/errors/import/miss/mixin/control-else/inside.hrx
+++ b/spec/non_conformant/errors/import/miss/mixin/control-else/inside.hrx
@@ -10,14 +10,14 @@ foo {
   @include do_import();
 }
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 4 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 4 |     @import '_include';
   |     ^^^^^^^^^^^^^^^^^^
   '
   input.scss 4:5  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 4 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/mixin/control-else/outside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-else/outside.hrx
index 4d3936a18f..f14d9cf922 100644
--- a/spec/non_conformant/errors/import/miss/mixin/control-else/outside.hrx
+++ b/spec/non_conformant/errors/import/miss/mixin/control-else/outside.hrx
@@ -9,14 +9,14 @@
 }
 
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/mixin/control-if/inside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-if/inside.hrx
index e4b7799303..c383d29162 100644
--- a/spec/non_conformant/errors/import/miss/mixin/control-if/inside.hrx
+++ b/spec/non_conformant/errors/import/miss/mixin/control-if/inside.hrx
@@ -9,14 +9,14 @@ foo {
   @include do_import();
 }
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 3 |     @import '_include';
   |     ^^^^^^^^^^^^^^^^^^
   '
   input.scss 3:5  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/mixin/control-if/outside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-if/outside.hrx
index c3068fe6cb..cbf766782d 100644
--- a/spec/non_conformant/errors/import/miss/mixin/control-if/outside.hrx
+++ b/spec/non_conformant/errors/import/miss/mixin/control-if/outside.hrx
@@ -7,14 +7,14 @@
   @include do_import();
 }
 <===> error
-Error: Import directives may not be used within control directives or mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @import '_include';
   |   ^^^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Import directives may not be used within control directives or mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/mixin/simple/inside.hrx b/spec/non_conformant/errors/import/miss/mixin/simple/inside.hrx
index dd2f99ed1d..e1ac8369db 100644
--- a/spec/non_conformant/errors/import/miss/mixin/simple/inside.hrx
+++ b/spec/non_conformant/errors/import/miss/mixin/simple/inside.hrx
@@ -7,12 +7,6 @@ foo {
   @include import-google-fonts();
 }
 <===> error
-Error: Undefined variable: "$family".
-        on line 2 of input.scss, in `import-google-fonts'
-        from line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined variable.
   ,
 2 |   @import url("http://fonts.googleapis.com/css?family=#{$family}");
@@ -20,3 +14,9 @@ Error: Undefined variable.
   '
   input.scss 2:57  import-google-fonts()
   input.scss 6:3   root stylesheet
+
+<===> error-libsass
+Error: Undefined variable: "$family".
+        on line 2 of input.scss, in `import-google-fonts'
+        from line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/miss/simple.hrx b/spec/non_conformant/errors/import/miss/simple.hrx
index d2565cd2a1..e15d329b77 100644
--- a/spec/non_conformant/errors/import/miss/simple.hrx
+++ b/spec/non_conformant/errors/import/miss/simple.hrx
@@ -8,16 +8,6 @@ div[name="hello"] {
 
 @import "bludge.css";
 <===> output.css
-@import url(hey1.css);
-@import url(cookie.css);
-@import url("hey2.css");
-@import url(fudge.css);
-@import url(bludge.css);
-div[name="hello"] {
-  color: blue;
-}
-
-<===> output-dart-sass.css
 @import "hey1.css";
 @import "cookie.css";
 @import url("hey2.css");
@@ -26,3 +16,13 @@ div[name="hello"] {
 div[name=hello] {
   color: blue;
 }
+
+<===> output-libsass.css
+@import url(hey1.css);
+@import url(cookie.css);
+@import url("hey2.css");
+@import url(fudge.css);
+@import url(bludge.css);
+div[name="hello"] {
+  color: blue;
+}
diff --git a/spec/non_conformant/errors/import/url/mixin/simple/inside.hrx b/spec/non_conformant/errors/import/url/mixin/simple/inside.hrx
index dd2f99ed1d..e1ac8369db 100644
--- a/spec/non_conformant/errors/import/url/mixin/simple/inside.hrx
+++ b/spec/non_conformant/errors/import/url/mixin/simple/inside.hrx
@@ -7,12 +7,6 @@ foo {
   @include import-google-fonts();
 }
 <===> error
-Error: Undefined variable: "$family".
-        on line 2 of input.scss, in `import-google-fonts'
-        from line 6 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined variable.
   ,
 2 |   @import url("http://fonts.googleapis.com/css?family=#{$family}");
@@ -20,3 +14,9 @@ Error: Undefined variable.
   '
   input.scss 2:57  import-google-fonts()
   input.scss 6:3   root stylesheet
+
+<===> error-libsass
+Error: Undefined variable: "$family".
+        on line 2 of input.scss, in `import-google-fonts'
+        from line 6 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/import/url/simple.hrx b/spec/non_conformant/errors/import/url/simple.hrx
index d2565cd2a1..e15d329b77 100644
--- a/spec/non_conformant/errors/import/url/simple.hrx
+++ b/spec/non_conformant/errors/import/url/simple.hrx
@@ -8,16 +8,6 @@ div[name="hello"] {
 
 @import "bludge.css";
 <===> output.css
-@import url(hey1.css);
-@import url(cookie.css);
-@import url("hey2.css");
-@import url(fudge.css);
-@import url(bludge.css);
-div[name="hello"] {
-  color: blue;
-}
-
-<===> output-dart-sass.css
 @import "hey1.css";
 @import "cookie.css";
 @import url("hey2.css");
@@ -26,3 +16,13 @@ div[name="hello"] {
 div[name=hello] {
   color: blue;
 }
+
+<===> output-libsass.css
+@import url(hey1.css);
+@import url(cookie.css);
+@import url("hey2.css");
+@import url(fudge.css);
+@import url(bludge.css);
+div[name="hello"] {
+  color: blue;
+}
diff --git a/spec/non_conformant/errors/interpolation/error-1.hrx b/spec/non_conformant/errors/interpolation/error-1.hrx
index bafb75eaa1..d3e4cda48a 100644
--- a/spec/non_conformant/errors/interpolation/error-1.hrx
+++ b/spec/non_conformant/errors/interpolation/error-1.hrx
@@ -2,14 +2,14 @@
 '#{)'{
 
 <===> error
-Error: Invalid CSS after "'#{": expected expression (e.g. 1px, bold), was ")'{"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | '#{)'{
   |  ^^
   '
   input.scss 1:2  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "'#{": expected expression (e.g. 1px, bold), was ")'{"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-operation/gt.hrx b/spec/non_conformant/errors/invalid-operation/gt.hrx
index caf3f4ba43..a44e899c63 100644
--- a/spec/non_conformant/errors/invalid-operation/gt.hrx
+++ b/spec/non_conformant/errors/invalid-operation/gt.hrx
@@ -3,14 +3,14 @@ test {
   err: 2px > red;
 }
 <===> error
-Error: Undefined operation: "2px gt red".
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined operation "2px > red".
   ,
 2 |   err: 2px > red;
   |        ^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px gt red".
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-operation/gte.hrx b/spec/non_conformant/errors/invalid-operation/gte.hrx
index 86c89d73ec..818952b26f 100644
--- a/spec/non_conformant/errors/invalid-operation/gte.hrx
+++ b/spec/non_conformant/errors/invalid-operation/gte.hrx
@@ -3,14 +3,14 @@ test {
   err: 2px >= red;
 }
 <===> error
-Error: Undefined operation: "2px gte red".
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined operation "2px >= red".
   ,
 2 |   err: 2px >= red;
   |        ^^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px gte red".
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-operation/lt.hrx b/spec/non_conformant/errors/invalid-operation/lt.hrx
index e1cb66f26d..c4ee9aa802 100644
--- a/spec/non_conformant/errors/invalid-operation/lt.hrx
+++ b/spec/non_conformant/errors/invalid-operation/lt.hrx
@@ -3,14 +3,14 @@ test {
   err: 2px < red;
 }
 <===> error
-Error: Undefined operation: "2px lt red".
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined operation "2px < red".
   ,
 2 |   err: 2px < red;
   |        ^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px lt red".
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-operation/lte.hrx b/spec/non_conformant/errors/invalid-operation/lte.hrx
index cc4c123cc6..e03a95093e 100644
--- a/spec/non_conformant/errors/invalid-operation/lte.hrx
+++ b/spec/non_conformant/errors/invalid-operation/lte.hrx
@@ -3,14 +3,14 @@ test {
   err: 2px <= red;
 }
 <===> error
-Error: Undefined operation: "2px lte red".
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined operation "2px <= red".
   ,
 2 |   err: 2px <= red;
   |        ^^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px lte red".
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-operation/mod.hrx b/spec/non_conformant/errors/invalid-operation/mod.hrx
index 9e6be6d110..caa328f8dd 100644
--- a/spec/non_conformant/errors/invalid-operation/mod.hrx
+++ b/spec/non_conformant/errors/invalid-operation/mod.hrx
@@ -3,15 +3,15 @@ test {
   err: 2px % red;
 }
 <===> error
-Error: Undefined operation: "2px mod red".
-        on line 2:8 of input.scss
->>   err: 2px % red;
-   -------^
-
-<===> error-dart-sass
 Error: Undefined operation "2px % red".
   ,
 2 |   err: 2px % red;
   |        ^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px mod red".
+        on line 2:8 of input.scss
+>>   err: 2px % red;
+   -------^
diff --git a/spec/non_conformant/errors/invalid-operation/plus.hrx b/spec/non_conformant/errors/invalid-operation/plus.hrx
index f5c34ef5f2..f1e1275166 100644
--- a/spec/non_conformant/errors/invalid-operation/plus.hrx
+++ b/spec/non_conformant/errors/invalid-operation/plus.hrx
@@ -8,14 +8,14 @@ test {
   err: 2px + red;
 }
 <===> error
-Error: Undefined operation: "2px plus red".
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined operation "2px + red".
   ,
 2 |   err: 2px + red;
   |        ^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px plus red".
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-operation/times.hrx b/spec/non_conformant/errors/invalid-operation/times.hrx
index bfe88c8252..444cb91c80 100644
--- a/spec/non_conformant/errors/invalid-operation/times.hrx
+++ b/spec/non_conformant/errors/invalid-operation/times.hrx
@@ -8,14 +8,14 @@ test {
   err: 2px * red;
 }
 <===> error
-Error: Undefined operation: "2px times red".
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Undefined operation "2px * red".
   ,
 2 |   err: 2px * red;
   |        ^^^^^^^^^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "2px times red".
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/function-in-each.hrx b/spec/non_conformant/errors/invalid-parent/function-in-each.hrx
index abc120e175..8c828ca66e 100644
--- a/spec/non_conformant/errors/invalid-parent/function-in-each.hrx
+++ b/spec/non_conformant/errors/invalid-parent/function-in-each.hrx
@@ -3,14 +3,14 @@
   @function foo() {}
 }
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {}
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/function-in-for.hrx b/spec/non_conformant/errors/invalid-parent/function-in-for.hrx
index 5840550ff6..7f80686b01 100644
--- a/spec/non_conformant/errors/invalid-parent/function-in-for.hrx
+++ b/spec/non_conformant/errors/invalid-parent/function-in-for.hrx
@@ -3,14 +3,14 @@
   @function foo() {}
 }
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {}
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/function-in-function.hrx b/spec/non_conformant/errors/invalid-parent/function-in-function.hrx
index f90f6424fb..58d720ad06 100644
--- a/spec/non_conformant/errors/invalid-parent/function-in-function.hrx
+++ b/spec/non_conformant/errors/invalid-parent/function-in-function.hrx
@@ -3,14 +3,14 @@
   @function bar() {}
 }
 <===> error
-Error: Functions can only contain variable declarations and control directives.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @function bar() {}
   |   ^^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions can only contain variable declarations and control directives.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/function-in-if.hrx b/spec/non_conformant/errors/invalid-parent/function-in-if.hrx
index 7e543d1fae..5bce870a97 100644
--- a/spec/non_conformant/errors/invalid-parent/function-in-if.hrx
+++ b/spec/non_conformant/errors/invalid-parent/function-in-if.hrx
@@ -3,14 +3,14 @@
   @function foo() {}
 }
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {}
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/function-in-mixin.hrx b/spec/non_conformant/errors/invalid-parent/function-in-mixin.hrx
index a0ffd00bf2..02119435bb 100644
--- a/spec/non_conformant/errors/invalid-parent/function-in-mixin.hrx
+++ b/spec/non_conformant/errors/invalid-parent/function-in-mixin.hrx
@@ -6,14 +6,14 @@ foo {
   bar: include mix();
 }
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not contain function declarations.
   ,
 2 |   @function foo() {}
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/function-in-while.hrx b/spec/non_conformant/errors/invalid-parent/function-in-while.hrx
index 6726d676ee..b89828a859 100644
--- a/spec/non_conformant/errors/invalid-parent/function-in-while.hrx
+++ b/spec/non_conformant/errors/invalid-parent/function-in-while.hrx
@@ -3,14 +3,14 @@
   @function foo() {}
 }
 <===> error
-Error: Functions may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Functions may not be declared in control directives.
   ,
 2 |   @function foo() {}
   |   ^^^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/mixin-in-each.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-each.hrx
index 50f81194c1..6cedea7da9 100644
--- a/spec/non_conformant/errors/invalid-parent/mixin-in-each.hrx
+++ b/spec/non_conformant/errors/invalid-parent/mixin-in-each.hrx
@@ -3,14 +3,14 @@
   @mixin foo() {}
 }
 <===> error
-Error: Mixins may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not be declared in control directives.
   ,
 2 |   @mixin foo() {}
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Mixins may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/mixin-in-for.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-for.hrx
index 252392f088..8a0454f3f7 100644
--- a/spec/non_conformant/errors/invalid-parent/mixin-in-for.hrx
+++ b/spec/non_conformant/errors/invalid-parent/mixin-in-for.hrx
@@ -3,14 +3,14 @@
   @mixin foo() {}
 }
 <===> error
-Error: Mixins may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not be declared in control directives.
   ,
 2 |   @mixin foo() {}
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Mixins may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/mixin-in-function.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-function.hrx
index e491514e13..bb1caa4fa1 100644
--- a/spec/non_conformant/errors/invalid-parent/mixin-in-function.hrx
+++ b/spec/non_conformant/errors/invalid-parent/mixin-in-function.hrx
@@ -3,14 +3,14 @@
   @mixin bar() {}
 }
 <===> error
-Error: Functions can only contain variable declarations and control directives.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @mixin bar() {}
   |   ^^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Functions can only contain variable declarations and control directives.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/mixin-in-if.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-if.hrx
index 6a313ce62d..e8df5a13f6 100644
--- a/spec/non_conformant/errors/invalid-parent/mixin-in-if.hrx
+++ b/spec/non_conformant/errors/invalid-parent/mixin-in-if.hrx
@@ -3,14 +3,14 @@
   @mixin foo() {}
 }
 <===> error
-Error: Mixins may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not be declared in control directives.
   ,
 2 |   @mixin foo() {}
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Mixins may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/mixin-in-mixin.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-mixin.hrx
index fecae63f8d..ce2a0b404f 100644
--- a/spec/non_conformant/errors/invalid-parent/mixin-in-mixin.hrx
+++ b/spec/non_conformant/errors/invalid-parent/mixin-in-mixin.hrx
@@ -6,14 +6,14 @@ foo {
   bar: include mix();
 }
 <===> error
-Error: Mixins may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not contain mixin declarations.
   ,
 2 |   @mixin foo() {}
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Mixins may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/mixin-in-while.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-while.hrx
index ac68ee9e98..4198e67ddf 100644
--- a/spec/non_conformant/errors/invalid-parent/mixin-in-while.hrx
+++ b/spec/non_conformant/errors/invalid-parent/mixin-in-while.hrx
@@ -3,14 +3,14 @@
   @mixin foo() {}
 }
 <===> error
-Error: Mixins may not be defined within control directives or other mixins.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Mixins may not be declared in control directives.
   ,
 2 |   @mixin foo() {}
   |   ^^^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: Mixins may not be defined within control directives or other mixins.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/return-in-mixin.hrx b/spec/non_conformant/errors/invalid-parent/return-in-mixin.hrx
index 52d5635946..1ea4c6b774 100644
--- a/spec/non_conformant/errors/invalid-parent/return-in-mixin.hrx
+++ b/spec/non_conformant/errors/invalid-parent/return-in-mixin.hrx
@@ -7,14 +7,14 @@ foo {
   @include mix();
 }
 <===> error
-Error: @return may only be used within a function.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @return 42;
   |   ^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: @return may only be used within a function.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/return-in-root.hrx b/spec/non_conformant/errors/invalid-parent/return-in-root.hrx
index 9c00c72c7d..449f550d82 100644
--- a/spec/non_conformant/errors/invalid-parent/return-in-root.hrx
+++ b/spec/non_conformant/errors/invalid-parent/return-in-root.hrx
@@ -1,14 +1,14 @@
 <===> input.scss
 @return 42;
 <===> error
-Error: @return may only be used within a function.
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 1 | @return 42;
   | ^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: @return may only be used within a function.
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/invalid-parent/return-in-ruleset.hrx b/spec/non_conformant/errors/invalid-parent/return-in-ruleset.hrx
index 9c6f416cdb..592ccccc69 100644
--- a/spec/non_conformant/errors/invalid-parent/return-in-ruleset.hrx
+++ b/spec/non_conformant/errors/invalid-parent/return-in-ruleset.hrx
@@ -3,14 +3,14 @@ ruleset {
   @return 42;
 }
 <===> error
-Error: @return may only be used within a function.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: This at-rule is not allowed here.
   ,
 2 |   @return 42;
   |   ^^^^^^^^^^
   '
   input.scss 2:3  root stylesheet
+
+<===> error-libsass
+Error: @return may only be used within a function.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/unicode/report/after/error b/spec/non_conformant/errors/unicode/report/after/error
index 8549192d95..e2b32902f0 100644
--- a/spec/non_conformant/errors/unicode/report/after/error
+++ b/spec/non_conformant/errors/unicode/report/after/error
@@ -1,3 +1,6 @@
-Error: Invalid CSS after "foo{;öüäöüäöü": expected "{", was ""
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: expected "{".
+  ,
+1 | foo{;öüäöüäöü
+  |              ^
+  '
+  input.scss 1:14  root stylesheet
diff --git a/spec/non_conformant/errors/unicode/report/after/error-dart-sass b/spec/non_conformant/errors/unicode/report/after/error-dart-sass
deleted file mode 100644
index e2b32902f0..0000000000
--- a/spec/non_conformant/errors/unicode/report/after/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: expected "{".
-  ,
-1 | foo{;öüäöüäöü
-  |              ^
-  '
-  input.scss 1:14  root stylesheet
diff --git a/spec/non_conformant/errors/unicode/report/after/error-libsass b/spec/non_conformant/errors/unicode/report/after/error-libsass
new file mode 100644
index 0000000000..8549192d95
--- /dev/null
+++ b/spec/non_conformant/errors/unicode/report/after/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid CSS after "foo{;öüäöüäöü": expected "{", was ""
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/errors/unicode/report/before/error b/spec/non_conformant/errors/unicode/report/before/error
index be10ff3662..f1cc995849 100644
--- a/spec/non_conformant/errors/unicode/report/before/error
+++ b/spec/non_conformant/errors/unicode/report/before/error
@@ -1,3 +1,6 @@
-Error: Invalid CSS after "öüäöüäöü{a:c": expected "{", was ""
-        on line 1 of input.scss
-  Use --trace for backtrace.
+Error: expected "}".
+  ,
+1 | öüäöüäöü{a:c
+  |             ^
+  '
+  input.scss 1:13  root stylesheet
diff --git a/spec/non_conformant/errors/unicode/report/before/error-dart-sass b/spec/non_conformant/errors/unicode/report/before/error-dart-sass
deleted file mode 100644
index f1cc995849..0000000000
--- a/spec/non_conformant/errors/unicode/report/before/error-dart-sass
+++ /dev/null
@@ -1,6 +0,0 @@
-Error: expected "}".
-  ,
-1 | öüäöüäöü{a:c
-  |             ^
-  '
-  input.scss 1:13  root stylesheet
diff --git a/spec/non_conformant/errors/unicode/report/before/error-libsass b/spec/non_conformant/errors/unicode/report/before/error-libsass
new file mode 100644
index 0000000000..be10ff3662
--- /dev/null
+++ b/spec/non_conformant/errors/unicode/report/before/error-libsass
@@ -0,0 +1,3 @@
+Error: Invalid CSS after "öüäöüäöü{a:c": expected "{", was ""
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/extend-tests/013_test_dynamic_extendee.hrx b/spec/non_conformant/extend-tests/013_test_dynamic_extendee.hrx
index 5d29cf61da..53522a9769 100644
--- a/spec/non_conformant/extend-tests/013_test_dynamic_extendee.hrx
+++ b/spec/non_conformant/extend-tests/013_test_dynamic_extendee.hrx
@@ -3,11 +3,11 @@
 .bar {@extend [baz^="blip#{12px}"]}
 
 <===> output.css
-[baz^="blip12px"], .bar {
+[baz^=blip12px], .bar {
   a: b;
 }
 
-<===> output-dart-sass.css
-[baz^=blip12px], .bar {
+<===> output-libsass.css
+[baz^="blip12px"], .bar {
   a: b;
 }
diff --git a/spec/non_conformant/extend-tests/094_test_long_extendee_runs_unification.hrx b/spec/non_conformant/extend-tests/094_test_long_extendee_runs_unification.hrx
index 11e6b29212..b2eaefa2bb 100644
--- a/spec/non_conformant/extend-tests/094_test_long_extendee_runs_unification.hrx
+++ b/spec/non_conformant/extend-tests/094_test_long_extendee_runs_unification.hrx
@@ -7,7 +7,7 @@
 ns|*.foo.bar {a: b}
 a.baz {@extend .foo.bar}
 
-<===> error-dart-sass
+<===> error
 Error: compound selectors may no longer be extended.
 Consider `@extend .foo, .bar` instead.
 See http://bit.ly/ExtendCompound for details.
diff --git a/spec/non_conformant/extend-tests/178_test_combinator_unification_with_newlines.hrx b/spec/non_conformant/extend-tests/178_test_combinator_unification_with_newlines.hrx
index 30e179c5fd..06ddd5469d 100644
--- a/spec/non_conformant/extend-tests/178_test_combinator_unification_with_newlines.hrx
+++ b/spec/non_conformant/extend-tests/178_test_combinator_unification_with_newlines.hrx
@@ -7,13 +7,6 @@
 y {@extend x}
 
 <===> output.css
-.a >
-.b
-+ x, .c.a > .d.b + y {
-  a: b;
-}
-
-<===> output-dart-sass.css
 .a > .b + x, .c.a > .d.b + y {
   a: b;
 }
diff --git a/spec/non_conformant/extend-tests/180_test_basic_extend_loop.hrx b/spec/non_conformant/extend-tests/180_test_basic_extend_loop.hrx
index 655cd674ff..a89f32c1f1 100644
--- a/spec/non_conformant/extend-tests/180_test_basic_extend_loop.hrx
+++ b/spec/non_conformant/extend-tests/180_test_basic_extend_loop.hrx
@@ -11,7 +11,7 @@
   c: d;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .foo, .bar {
   a: b;
 }
diff --git a/spec/non_conformant/extend-tests/220_test_extend_in_double_nested_media_query.hrx b/spec/non_conformant/extend-tests/220_test_extend_in_double_nested_media_query.hrx
index 5259b90234..63fb8a212c 100644
--- a/spec/non_conformant/extend-tests/220_test_extend_in_double_nested_media_query.hrx
+++ b/spec/non_conformant/extend-tests/220_test_extend_in_double_nested_media_query.hrx
@@ -7,14 +7,14 @@
 }
 
 <===> output.css
-@media all and (orientation: landscape) {
+@media (orientation: landscape) {
   .bar {
     color: blue;
   }
 }
 
-<===> output-dart-sass.css
-@media (orientation: landscape) {
+<===> output-libsass.css
+@media all and (orientation: landscape) {
   .bar {
     color: blue;
   }
diff --git a/spec/non_conformant/extend-tests/extend-loop.hrx b/spec/non_conformant/extend-tests/extend-loop.hrx
index f1da58aea1..2d306895db 100644
--- a/spec/non_conformant/extend-tests/extend-loop.hrx
+++ b/spec/non_conformant/extend-tests/extend-loop.hrx
@@ -54,7 +54,7 @@
     x: y;
   }
 
-  .c1, .z1.b1, .z1.x1.y1.a1, .z1.x1.y1.c1 {
+  .c1, .z1.b1, .z1.x1.y1.a1, .z1.x1.y1.c1, .z1.x1.y1.b1 {
     x: y;
   }
 }
@@ -63,7 +63,7 @@
     x: y;
   }
 
-  .c2, .z2.b2, .z2.x2.y2.a2, .z2.x2.y2.c2 {
+  .c2, .z2.b2, .z2.x2.y2.a2, .z2.x2.y2.c2, .z2.x2.y2.b2 {
     x: y;
   }
 
@@ -80,7 +80,7 @@
     x: y;
   }
 
-  .c3, .z3.b3, .z3.x3.y3.a3, .z3.x3.y3.c3 {
+  .c3, .z3.b3, .z3.x3.y3.a3, .z3.x3.y3.c3, .z3.x3.y3.b3 {
     x: y;
   }
 }
@@ -89,7 +89,7 @@
     x: y;
   }
 
-  .c4, .z4.b4, .z4.x4.y4.a4, .z4.x4.y4.c4 {
+  .c4, .z4.b4, .z4.x4.y4.a4, .z4.x4.y4.c4, .z4.x4.y4.b4 {
     x: y;
   }
 
@@ -98,7 +98,7 @@
   }
 }
 @media order5 {
-  .c5, .z5.b5, .z5.x5.y5.a5, .z5.x5.y5.c5 {
+  .c5, .z5.b5, .z5.x5.y5.a5, .z5.x5.y5.c5, .z5.x5.y5.b5 {
     x: y;
   }
 
@@ -111,7 +111,7 @@
   }
 }
 @media order6 {
-  .c6, .z6.b6, .z6.x6.y6.a6, .z6.x6.y6.c6 {
+  .c6, .z6.b6, .z6.x6.y6.a6, .z6.x6.y6.c6, .z6.x6.y6.b6 {
     x: y;
   }
 
@@ -124,7 +124,7 @@
   }
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 @media order1 {
   .x1.y1.a1, .x1.y1.c1, .x1.y1.z1.b1 {
     x: y;
@@ -134,7 +134,7 @@
     x: y;
   }
 
-  .c1, .z1.b1, .z1.x1.y1.a1, .z1.x1.y1.c1, .z1.x1.y1.b1 {
+  .c1, .z1.b1, .z1.x1.y1.a1, .z1.x1.y1.c1 {
     x: y;
   }
 }
@@ -143,7 +143,7 @@
     x: y;
   }
 
-  .c2, .z2.b2, .z2.x2.y2.a2, .z2.x2.y2.c2, .z2.x2.y2.b2 {
+  .c2, .z2.b2, .z2.x2.y2.a2, .z2.x2.y2.c2 {
     x: y;
   }
 
@@ -160,7 +160,7 @@
     x: y;
   }
 
-  .c3, .z3.b3, .z3.x3.y3.a3, .z3.x3.y3.c3, .z3.x3.y3.b3 {
+  .c3, .z3.b3, .z3.x3.y3.a3, .z3.x3.y3.c3 {
     x: y;
   }
 }
@@ -169,7 +169,7 @@
     x: y;
   }
 
-  .c4, .z4.b4, .z4.x4.y4.a4, .z4.x4.y4.c4, .z4.x4.y4.b4 {
+  .c4, .z4.b4, .z4.x4.y4.a4, .z4.x4.y4.c4 {
     x: y;
   }
 
@@ -178,7 +178,7 @@
   }
 }
 @media order5 {
-  .c5, .z5.b5, .z5.x5.y5.a5, .z5.x5.y5.c5, .z5.x5.y5.b5 {
+  .c5, .z5.b5, .z5.x5.y5.a5, .z5.x5.y5.c5 {
     x: y;
   }
 
@@ -191,7 +191,7 @@
   }
 }
 @media order6 {
-  .c6, .z6.b6, .z6.x6.y6.a6, .z6.x6.y6.c6, .z6.x6.y6.b6 {
+  .c6, .z6.b6, .z6.x6.y6.a6, .z6.x6.y6.c6 {
     x: y;
   }
 
diff --git a/spec/non_conformant/misc/error-directive.hrx b/spec/non_conformant/misc/error-directive.hrx
index e7eb473784..2bebf6cd00 100644
--- a/spec/non_conformant/misc/error-directive.hrx
+++ b/spec/non_conformant/misc/error-directive.hrx
@@ -2,14 +2,14 @@
 @error "Buckle your seatbelt Dorothy, 'cause Kansas is going bye-bye"
 
 <===> error
-Error: Buckle your seatbelt Dorothy, 'cause Kansas is going bye-bye
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: "Buckle your seatbelt Dorothy, 'cause Kansas is going bye-bye"
   ,
 1 | @error "Buckle your seatbelt Dorothy, 'cause Kansas is going bye-bye"
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   '
   input.scss 1:1  root stylesheet
+
+<===> error-libsass
+Error: Buckle your seatbelt Dorothy, 'cause Kansas is going bye-bye
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/misc/warn-directive.hrx b/spec/non_conformant/misc/warn-directive.hrx
index 61410eeec8..68d9390692 100644
--- a/spec/non_conformant/misc/warn-directive.hrx
+++ b/spec/non_conformant/misc/warn-directive.hrx
@@ -9,8 +9,8 @@ h1 {
 
 <===> warning
 WARNING: Don't crash the ambulance, whatever you do
-         on line 2 of input.scss
+    input.scss 2:1  root stylesheet
 
-<===> warning-dart-sass
+<===> warning-libsass
 WARNING: Don't crash the ambulance, whatever you do
-    input.scss 2:1  root stylesheet
+         on line 2 of input.scss
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-1.hrx
index dee0c04dce..065328fff6 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-1.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-1.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...comma-error($a,": expected ")", was ",$b);"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 3 |   e: double-comma-error($a,,$b);
   |                            ^
   '
   input.scss 3:28  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...comma-error($a,": expected ")", was ",$b);"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-2.hrx
index 896ec362bd..e3a420db5e 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-2.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-2.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...ma-error($a,$b,": expected ")", was ",);"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 3 |   a: double-comma-error($a,$b,,);
   |                               ^
   '
   input.scss 3:31  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...ma-error($a,$b,": expected ")", was ",);"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-3.hrx
index 27164cb7ed..d582d3ee02 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-3.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-3.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...rminated($a,$b,": expected ")", was ";"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 3 |   a: incorrectly-terminated($a,$b,;
   |                                   ^
   '
   input.scss 3:35  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...rminated($a,$b,": expected ")", was ";"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-1.hrx
index 4b9dee0731..60e12fbee3 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-1.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-1.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...comma-error($a,": expected variable (e.g. $foo), was ",$b) {"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 2 | @function double-comma-error($a,,$b) {
   |                                 ^
   '
   input.scss 2:33  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...comma-error($a,": expected variable (e.g. $foo), was ",$b) {"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-2.hrx
index 65fec144c5..d878ef639c 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-2.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-2.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...ma-error($a,$b,": expected variable (e.g. $foo), was ",) {"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 2 | @function double-comma-error($a,$b,,) {
   |                                    ^
   '
   input.scss 2:36  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...ma-error($a,$b,": expected variable (e.g. $foo), was ",) {"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-3.hrx
index dd76c27d94..5634872108 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-3.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-3.hrx
@@ -4,11 +4,6 @@
 }
 
 <===> error
-Error: Invalid CSS after "...n-error($a,$b, ": expected variable (e.g. $foo), was "{"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 2 | @function missing-paren-error($a,$b, {
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-1.hrx
index 78f607e486..601ed60bc2 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-1.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-1.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...comma-error($a,": expected ")", was ",$b);"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 3 |   @include double-comma-error($a,,$b);
   |                                  ^
   '
   input.scss 3:34  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...comma-error($a,": expected ")", was ",$b);"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-2.hrx
index c93b351411..8e54ab79fb 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-2.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-2.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...ma-error($a,$b,": expected ")", was ",);"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 3 |   @include double-comma-error($a,$b,,);
   |                                     ^
   '
   input.scss 3:37  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...ma-error($a,$b,": expected ")", was ",);"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-3.hrx
index 551a374814..a469bb2426 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-3.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-3.hrx
@@ -5,14 +5,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...rminated($a,$b,": expected ")", was ";"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 3 |   @include incorrectly-terminated($a,$b,;
   |                                         ^
   '
   input.scss 3:41  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...rminated($a,$b,": expected ")", was ";"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-1.hrx
index c63d8ae967..f83dd19be8 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-1.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-1.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...comma-error($a,": expected variable (e.g. $foo), was ",$b) {"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 2 | @mixin double-comma-error($a,,$b) {
   |                              ^
   '
   input.scss 2:30  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...comma-error($a,": expected variable (e.g. $foo), was ",$b) {"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-2.hrx
index a4159b71cb..1a3e365c36 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-2.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-2.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "...ma-error($a,$b,": expected variable (e.g. $foo), was ",) {"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 2 | @mixin double-comma-error($a,$b,,) {
   |                                 ^
   '
   input.scss 2:33  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "...ma-error($a,$b,": expected variable (e.g. $foo), was ",) {"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-3.hrx
index d6f3f20ee4..f4b4da554e 100644
--- a/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-3.hrx
+++ b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-3.hrx
@@ -4,11 +4,6 @@
 }
 
 <===> error
-Error: Invalid CSS after "...n-error($a,$b, ": expected variable (e.g. $foo), was "{"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 2 | @mixin missing-paren-error($a,$b, {
diff --git a/spec/non_conformant/parser/interpolate/01_literal/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/01_literal/06_escape_interpolation.hrx
index 71ad2dc6a3..9f09c00bdf 100644
--- a/spec/non_conformant/parser/interpolate/01_literal/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/01_literal/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: literal;
 }
 
 <===> output.css
-.result {
-  output: "[\#{literal}]";
-  output: "\#{literal}";
-  output: '\#{literal}';
-  output: "['\#{literal}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{literal}]";
   output: "#{literal}";
   output: "#{literal}";
   output: "['#{literal}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{literal}]";
+  output: "\#{literal}";
+  output: '\#{literal}';
+  output: "['\#{literal}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx
index a1c9b634e9..8eb216b7b3 100644
--- a/spec/non_conformant/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx
@@ -11,14 +11,14 @@ $input: "dquoted";
 .result {
   output: "[#{" dquoted "}]";
   output: "#{" dquoted "}";
-  output: '\#{"dquoted"}';
+  output: '#{"dquoted"}';
   output: "['#{" dquoted "}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
   output: "[#{" dquoted "}]";
   output: "#{" dquoted "}";
-  output: '#{"dquoted"}';
+  output: '\#{"dquoted"}';
   output: "['#{" dquoted "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/03_single_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/01_inline.hrx
index 9649bac01e..4d94607dc8 100644
--- a/spec/non_conformant/parser/interpolate/03_single_quoted/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/03_single_quoted/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: 'squoted';
+  output: "squoted";
   output: squoted;
   output: "[squoted]";
   output: "squoted";
@@ -18,9 +18,9 @@
   output: "['squoted']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "squoted";
+  output: 'squoted';
   output: squoted;
   output: "[squoted]";
   output: "squoted";
diff --git a/spec/non_conformant/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx
index 1320de49ea..fb186d927e 100644
--- a/spec/non_conformant/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx
@@ -9,16 +9,16 @@ $input: 'squoted';
 
 <===> output.css
 .result {
-  output: "[\#{'squoted'}]";
-  output: "\#{'squoted'}";
+  output: "[#{'squoted'}]";
+  output: "#{'squoted'}";
   output: "#{" squoted "}";
-  output: "['\#{'squoted'}']";
+  output: "['#{'squoted'}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "[#{'squoted'}]";
-  output: "#{'squoted'}";
+  output: "[\#{'squoted'}]";
+  output: "\#{'squoted'}";
   output: "#{" squoted "}";
-  output: "['#{'squoted'}']";
+  output: "['\#{'squoted'}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/04_space_list_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/01_inline.hrx
index a2cf3d3117..2e957a4f15 100644
--- a/spec/non_conformant/parser/interpolate/04_space_list_quoted/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/04_space_list_quoted/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: "alpha" 'beta';
+  output: "alpha" "beta";
   output: alpha beta;
   output: "[alpha beta]";
   output: "alpha beta";
@@ -18,9 +18,9 @@
   output: "['alpha beta']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "alpha" "beta";
+  output: "alpha" 'beta';
   output: alpha beta;
   output: "[alpha beta]";
   output: "alpha beta";
diff --git a/spec/non_conformant/parser/interpolate/05_comma_list_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/01_inline.hrx
index d3f3822f20..ca464bb541 100644
--- a/spec/non_conformant/parser/interpolate/05_comma_list_quoted/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: "alpha", 'beta';
+  output: "alpha", "beta";
   output: alpha, beta;
   output: "[alpha, beta]";
   output: "alpha, beta";
@@ -18,9 +18,9 @@
   output: "['alpha, beta']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "alpha", "beta";
+  output: "alpha", 'beta';
   output: alpha, beta;
   output: "[alpha, beta]";
   output: "alpha, beta";
diff --git a/spec/non_conformant/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx
index adeeea33bc..faedd55574 100644
--- a/spec/non_conformant/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: \\;
 }
 
 <===> output.css
-.result {
-  output: "[\#{\\}]";
-  output: "\#{\\}";
-  output: '\#{\\}';
-  output: "['\#{\\}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{\\}]";
   output: "#{\\}";
   output: "#{\\}";
   output: "['#{\\}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{\\}]";
+  output: "\#{\\}";
+  output: '\#{\\}';
+  output: "['\#{\\}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx
index 8331cc2da3..4da7d40090 100644
--- a/spec/non_conformant/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: l\\ite\ral;
 }
 
 <===> output.css
-.result {
-  output: "[\#{l\\ite\ral}]";
-  output: "\#{l\\ite\ral}";
-  output: '\#{l\\ite\ral}';
-  output: "['\#{l\\ite\ral}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{l\\iteral}]";
   output: "#{l\\iteral}";
   output: "#{l\\iteral}";
   output: "['#{l\\iteral}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{l\\ite\ral}]";
+  output: "\#{l\\ite\ral}";
+  output: '\#{l\\ite\ral}';
+  output: "['\#{l\\ite\ral}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/01_inline.hrx
index 6df813bbec..75ba85e483 100644
--- a/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: "l\\ite\ral";
+  output: "l\\iteral";
   output: l\iteral;
   output: "[l\\iteral]";
   output: "l\\iteral";
@@ -18,9 +18,9 @@
   output: "['l\\iteral']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "l\\iteral";
+  output: "l\\ite\ral";
   output: l\iteral;
   output: "[l\\iteral]";
   output: "l\\iteral";
diff --git a/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx
index 08f240e208..c7c1e879cc 100644
--- a/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx
@@ -16,14 +16,14 @@ $input: "l\\ite\ral";
 .result {
   output: "[#{" l\\iteral "}]";
   output: "#{" l\\iteral "}";
-  output: '\#{"l\\ite\ral"}';
+  output: '#{"l\\iteral"}';
   output: "['#{" l\\iteral "}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
   output: "[#{" l\\iteral "}]";
   output: "#{" l\\iteral "}";
-  output: '#{"l\\iteral"}';
+  output: '\#{"l\\ite\ral"}';
   output: "['#{" l\\iteral "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/01_inline.hrx
index 87749d21b6..e6bf143e93 100644
--- a/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: 'l\\ite\ral';
+  output: "l\\iteral";
   output: l\iteral;
   output: "[l\\iteral]";
   output: "l\\iteral";
@@ -18,9 +18,9 @@
   output: "['l\\iteral']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "l\\iteral";
+  output: 'l\\ite\ral';
   output: l\iteral;
   output: "[l\\iteral]";
   output: "l\\iteral";
diff --git a/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx
index e30ab6f34d..7c0066b614 100644
--- a/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx
@@ -14,16 +14,16 @@ $input: 'l\\ite\ral';
 
 <===> output.css
 .result {
-  output: "[\#{'l\\ite\ral'}]";
-  output: "\#{'l\\ite\ral'}";
+  output: "[#{'l\\iteral'}]";
+  output: "#{'l\\iteral'}";
   output: "#{" l\\iteral "}";
-  output: "['\#{'l\\ite\ral'}']";
+  output: "['#{'l\\iteral'}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "[#{'l\\iteral'}]";
-  output: "#{'l\\iteral'}";
+  output: "[\#{'l\\ite\ral'}]";
+  output: "\#{'l\\ite\ral'}";
   output: "#{" l\\iteral "}";
-  output: "['#{'l\\iteral'}']";
+  output: "['\#{'l\\ite\ral'}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx
index c45f5c9553..d41df26ddb 100644
--- a/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: \1\2\3\4\5\6\7\8\9;
 }
 
 <===> output.css
-.result {
-  output: "[\#{\1\2\3\4\5\6\7\8\9}]";
-  output: "\#{\1\2\3\4\5\6\7\8\9}";
-  output: '\#{\1\2\3\4\5\6\7\8\9}';
-  output: "['\#{\1\2\3\4\5\6\7\8\9}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{\1\2\3\4\5\6\7\8 	}]";
   output: "#{\1\2\3\4\5\6\7\8 	}";
   output: "#{\1\2\3\4\5\6\7\8 	}";
   output: "['#{\1\2\3\4\5\6\7\8 	}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{\1\2\3\4\5\6\7\8\9}]";
+  output: "\#{\1\2\3\4\5\6\7\8\9}";
+  output: '\#{\1\2\3\4\5\6\7\8\9}';
+  output: "['\#{\1\2\3\4\5\6\7\8\9}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx
index 57eef3624a..fb4ae13c6b 100644
--- a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx
@@ -9,16 +9,6 @@
 }
 
 <===> output.css
-.result {
-  output: "\1\2\3\4\5\6\7\8\9";
-  output: 
	;
-  output: "[
	]";
-  output: "
	";
-  output: "
	";
-  output: "['
	']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\1\2\3\4\5\6\7\8 	";
   output: 
	;
@@ -27,3 +17,13 @@
   output: "\1\2\3\4\5\6\7\8 	";
   output: "['\1\2\3\4\5\6\7\8 	']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "\1\2\3\4\5\6\7\8\9";
+  output: 
	;
+  output: "[
	]";
+  output: "
	";
+  output: "
	";
+  output: "['
	']";
+}
diff --git a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx
index 78823de35f..40004fa64a 100644
--- a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx
@@ -10,16 +10,6 @@ $input: "\1\2\3\4\5\6\7\8\9";
 }
 
 <===> output.css
-.result {
-  output: "
	";
-  output: 
	;
-  output: "[
	]";
-  output: "
	";
-  output: "
	";
-  output: "['
	']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\1\2\3\4\5\6\7\8 	";
   output: 
	;
@@ -28,3 +18,13 @@ $input: "\1\2\3\4\5\6\7\8\9";
   output: "\1\2\3\4\5\6\7\8 	";
   output: "['\1\2\3\4\5\6\7\8 	']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "
	";
+  output: 
	;
+  output: "[
	]";
+  output: "
	";
+  output: "
	";
+  output: "['
	']";
+}
diff --git a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx
index ff02f93d92..9e5ebccddd 100644
--- a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx
+++ b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx
@@ -14,20 +14,6 @@ $input: "\1\2\3\4\5\6\7\8\9";
 }
 
 <===> output.css
-.result {
-  dquoted: "
	";
-  dquoted: "[
	]";
-  dquoted: "
	";
-  dquoted: "
	";
-  dquoted: "['
	']";
-  squoted: "
	";
-  squoted: "[
	]";
-  squoted: "
	";
-  squoted: "
	";
-  squoted: "['
	']";
-}
-
-<===> output-dart-sass.css
 .result {
   dquoted: "\1\2\3\4\5\6\7\8 	";
   dquoted: "[\1\2\3\4\5\6\7\8 	]";
@@ -40,3 +26,17 @@ $input: "\1\2\3\4\5\6\7\8\9";
   squoted: "\1\2\3\4\5\6\7\8 	";
   squoted: "['\1\2\3\4\5\6\7\8 	']";
 }
+
+<===> output-libsass.css
+.result {
+  dquoted: "
	";
+  dquoted: "[
	]";
+  dquoted: "
	";
+  dquoted: "
	";
+  dquoted: "['
	']";
+  squoted: "
	";
+  squoted: "[
	]";
+  squoted: "
	";
+  squoted: "
	";
+  squoted: "['
	']";
+}
diff --git a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx
index a1a454af63..5c90f141f1 100644
--- a/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx
@@ -16,14 +16,14 @@ $input: "\1\2\3\4\5\6\7\8\9";
 .result {
   output: "[#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}]";
   output: "#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}";
-  output: '\#{"\1\2\3\4\5\6\7\8\9"}';
+  output: '#{"\1\2\3\4\5\6\7\8 	"}';
   output: "['#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
   output: "[#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}]";
   output: "#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}";
-  output: '#{"\1\2\3\4\5\6\7\8 	"}';
+  output: '\#{"\1\2\3\4\5\6\7\8\9"}';
   output: "['#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx
index 3752176e24..ddb718350b 100644
--- a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx
@@ -9,16 +9,6 @@
 }
 
 <===> output.css
-.result {
-  output: '\1\2\3\4\5\6\7\8\9';
-  output: 
	;
-  output: "[
	]";
-  output: "
	";
-  output: "
	";
-  output: "['
	']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\1\2\3\4\5\6\7\8 	";
   output: 
	;
@@ -27,3 +17,13 @@
   output: "\1\2\3\4\5\6\7\8 	";
   output: "['\1\2\3\4\5\6\7\8 	']";
 }
+
+<===> output-libsass.css
+.result {
+  output: '\1\2\3\4\5\6\7\8\9';
+  output: 
	;
+  output: "[
	]";
+  output: "
	";
+  output: "
	";
+  output: "['
	']";
+}
diff --git a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx
index afd53dd16e..543e4bec6d 100644
--- a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx
@@ -10,16 +10,6 @@ $input: '\1\2\3\4\5\6\7\8\9';
 }
 
 <===> output.css
-.result {
-  output: "
	";
-  output: 
	;
-  output: "[
	]";
-  output: "
	";
-  output: "
	";
-  output: "['
	']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\1\2\3\4\5\6\7\8 	";
   output: 
	;
@@ -28,3 +18,13 @@ $input: '\1\2\3\4\5\6\7\8\9';
   output: "\1\2\3\4\5\6\7\8 	";
   output: "['\1\2\3\4\5\6\7\8 	']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "
	";
+  output: 
	;
+  output: "[
	]";
+  output: "
	";
+  output: "
	";
+  output: "['
	']";
+}
diff --git a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx
index 196cf998ea..816f28cf59 100644
--- a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx
+++ b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx
@@ -14,20 +14,6 @@ $input: '\1\2\3\4\5\6\7\8\9';
 }
 
 <===> output.css
-.result {
-  dquoted: "
	";
-  dquoted: "[
	]";
-  dquoted: "
	";
-  dquoted: "
	";
-  dquoted: "['
	']";
-  squoted: "
	";
-  squoted: "[
	]";
-  squoted: "
	";
-  squoted: "
	";
-  squoted: "['
	']";
-}
-
-<===> output-dart-sass.css
 .result {
   dquoted: "\1\2\3\4\5\6\7\8 	";
   dquoted: "[\1\2\3\4\5\6\7\8 	]";
@@ -40,3 +26,17 @@ $input: '\1\2\3\4\5\6\7\8\9';
   squoted: "\1\2\3\4\5\6\7\8 	";
   squoted: "['\1\2\3\4\5\6\7\8 	']";
 }
+
+<===> output-libsass.css
+.result {
+  dquoted: "
	";
+  dquoted: "[
	]";
+  dquoted: "
	";
+  dquoted: "
	";
+  dquoted: "['
	']";
+  squoted: "
	";
+  squoted: "[
	]";
+  squoted: "
	";
+  squoted: "
	";
+  squoted: "['
	']";
+}
diff --git a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx
index 23cad97fbb..21d2ea340b 100644
--- a/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx
@@ -14,16 +14,16 @@ $input: '\1\2\3\4\5\6\7\8\9';
 
 <===> output.css
 .result {
-  output: "[\#{'\1\2\3\4\5\6\7\8\9'}]";
-  output: "\#{'\1\2\3\4\5\6\7\8\9'}";
+  output: "[#{'\1\2\3\4\5\6\7\8 	'}]";
+  output: "#{'\1\2\3\4\5\6\7\8 	'}";
   output: "#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}";
-  output: "['\#{'\1\2\3\4\5\6\7\8\9'}']";
+  output: "['#{'\1\2\3\4\5\6\7\8 	'}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "[#{'\1\2\3\4\5\6\7\8 	'}]";
-  output: "#{'\1\2\3\4\5\6\7\8 	'}";
+  output: "[\#{'\1\2\3\4\5\6\7\8\9'}]";
+  output: "\#{'\1\2\3\4\5\6\7\8\9'}";
   output: "#{" \1 \2 \3 \4 \5 \6 \7 \8 \9  "}";
-  output: "['#{'\1\2\3\4\5\6\7\8 	'}']";
+  output: "['\#{'\1\2\3\4\5\6\7\8\9'}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx
index db573506eb..ad23c00411 100644
--- a/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: \b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z;
 }
 
 <===> output.css
-.result {
-  output: "[\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}]";
-  output: "\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}";
-  output: '\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}';
-  output: "['\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{\b\c\d\e\fghijklmnopqrstuvwxyz}]";
   output: "#{\b\c\d\e\fghijklmnopqrstuvwxyz}";
   output: "#{\b\c\d\e\fghijklmnopqrstuvwxyz}";
   output: "['#{\b\c\d\e\fghijklmnopqrstuvwxyz}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}]";
+  output: "\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}";
+  output: '\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}';
+  output: "['\#{\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx
index 72a6dcc761..64f3838166 100644
--- a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx
@@ -9,16 +9,6 @@
 }
 
 <===> output.css
-.result {
-  output: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
-  output: 
ghijklmnopqrstuvwxyz;
-  output: "[
ghijklmnopqrstuvwxyz]";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "['
ghijklmnopqrstuvwxyz']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: 
ghijklmnopqrstuvwxyz;
@@ -27,3 +17,13 @@
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: "['\b\c\d\e\fghijklmnopqrstuvwxyz']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
+  output: 
ghijklmnopqrstuvwxyz;
+  output: "[
ghijklmnopqrstuvwxyz]";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "['
ghijklmnopqrstuvwxyz']";
+}
diff --git a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx
index a839a453d5..12972effb2 100644
--- a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx
@@ -10,16 +10,6 @@ $input: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
 }
 
 <===> output.css
-.result {
-  output: "
ghijklmnopqrstuvwxyz";
-  output: 
ghijklmnopqrstuvwxyz;
-  output: "[
ghijklmnopqrstuvwxyz]";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "['
ghijklmnopqrstuvwxyz']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: 
ghijklmnopqrstuvwxyz;
@@ -28,3 +18,13 @@ $input: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: "['\b\c\d\e\fghijklmnopqrstuvwxyz']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "
ghijklmnopqrstuvwxyz";
+  output: 
ghijklmnopqrstuvwxyz;
+  output: "[
ghijklmnopqrstuvwxyz]";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "['
ghijklmnopqrstuvwxyz']";
+}
diff --git a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx
index 85bd7d1a6a..97207bbf9d 100644
--- a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx
+++ b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx
@@ -14,20 +14,6 @@ $input: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
 }
 
 <===> output.css
-.result {
-  dquoted: "
ghijklmnopqrstuvwxyz";
-  dquoted: "[
ghijklmnopqrstuvwxyz]";
-  dquoted: "
ghijklmnopqrstuvwxyz";
-  dquoted: "
ghijklmnopqrstuvwxyz";
-  dquoted: "['
ghijklmnopqrstuvwxyz']";
-  squoted: "
ghijklmnopqrstuvwxyz";
-  squoted: "[
ghijklmnopqrstuvwxyz]";
-  squoted: "
ghijklmnopqrstuvwxyz";
-  squoted: "
ghijklmnopqrstuvwxyz";
-  squoted: "['
ghijklmnopqrstuvwxyz']";
-}
-
-<===> output-dart-sass.css
 .result {
   dquoted: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   dquoted: "[\b\c\d\e\fghijklmnopqrstuvwxyz]";
@@ -40,3 +26,17 @@ $input: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
   squoted: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   squoted: "['\b\c\d\e\fghijklmnopqrstuvwxyz']";
 }
+
+<===> output-libsass.css
+.result {
+  dquoted: "
ghijklmnopqrstuvwxyz";
+  dquoted: "[
ghijklmnopqrstuvwxyz]";
+  dquoted: "
ghijklmnopqrstuvwxyz";
+  dquoted: "
ghijklmnopqrstuvwxyz";
+  dquoted: "['
ghijklmnopqrstuvwxyz']";
+  squoted: "
ghijklmnopqrstuvwxyz";
+  squoted: "[
ghijklmnopqrstuvwxyz]";
+  squoted: "
ghijklmnopqrstuvwxyz";
+  squoted: "
ghijklmnopqrstuvwxyz";
+  squoted: "['
ghijklmnopqrstuvwxyz']";
+}
diff --git a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx
index 742bd19907..c9d091be60 100644
--- a/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx
@@ -16,14 +16,14 @@ $input: "\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z";
 .result {
   output: "[#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}]";
   output: "#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}";
-  output: '\#{"\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z"}';
+  output: '#{"\b\c\d\e\fghijklmnopqrstuvwxyz"}';
   output: "['#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
   output: "[#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}]";
   output: "#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}";
-  output: '#{"\b\c\d\e\fghijklmnopqrstuvwxyz"}';
+  output: '\#{"\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z"}';
   output: "['#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx
index bc88c1d0fd..6331602100 100644
--- a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx
@@ -9,16 +9,6 @@
 }
 
 <===> output.css
-.result {
-  output: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
-  output: 
ghijklmnopqrstuvwxyz;
-  output: "[
ghijklmnopqrstuvwxyz]";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "['
ghijklmnopqrstuvwxyz']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: 
ghijklmnopqrstuvwxyz;
@@ -27,3 +17,13 @@
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: "['\b\c\d\e\fghijklmnopqrstuvwxyz']";
 }
+
+<===> output-libsass.css
+.result {
+  output: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
+  output: 
ghijklmnopqrstuvwxyz;
+  output: "[
ghijklmnopqrstuvwxyz]";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "['
ghijklmnopqrstuvwxyz']";
+}
diff --git a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx
index 807e3b67bc..932bc35359 100644
--- a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx
@@ -10,16 +10,6 @@ $input: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
 }
 
 <===> output.css
-.result {
-  output: "
ghijklmnopqrstuvwxyz";
-  output: 
ghijklmnopqrstuvwxyz;
-  output: "[
ghijklmnopqrstuvwxyz]";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "
ghijklmnopqrstuvwxyz";
-  output: "['
ghijklmnopqrstuvwxyz']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: 
ghijklmnopqrstuvwxyz;
@@ -28,3 +18,13 @@ $input: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
   output: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   output: "['\b\c\d\e\fghijklmnopqrstuvwxyz']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "
ghijklmnopqrstuvwxyz";
+  output: 
ghijklmnopqrstuvwxyz;
+  output: "[
ghijklmnopqrstuvwxyz]";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "
ghijklmnopqrstuvwxyz";
+  output: "['
ghijklmnopqrstuvwxyz']";
+}
diff --git a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx
index 062363725e..176ccb0e1f 100644
--- a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx
+++ b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx
@@ -14,20 +14,6 @@ $input: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
 }
 
 <===> output.css
-.result {
-  dquoted: "
ghijklmnopqrstuvwxyz";
-  dquoted: "[
ghijklmnopqrstuvwxyz]";
-  dquoted: "
ghijklmnopqrstuvwxyz";
-  dquoted: "
ghijklmnopqrstuvwxyz";
-  dquoted: "['
ghijklmnopqrstuvwxyz']";
-  squoted: "
ghijklmnopqrstuvwxyz";
-  squoted: "[
ghijklmnopqrstuvwxyz]";
-  squoted: "
ghijklmnopqrstuvwxyz";
-  squoted: "
ghijklmnopqrstuvwxyz";
-  squoted: "['
ghijklmnopqrstuvwxyz']";
-}
-
-<===> output-dart-sass.css
 .result {
   dquoted: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   dquoted: "[\b\c\d\e\fghijklmnopqrstuvwxyz]";
@@ -40,3 +26,17 @@ $input: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
   squoted: "\b\c\d\e\fghijklmnopqrstuvwxyz";
   squoted: "['\b\c\d\e\fghijklmnopqrstuvwxyz']";
 }
+
+<===> output-libsass.css
+.result {
+  dquoted: "
ghijklmnopqrstuvwxyz";
+  dquoted: "[
ghijklmnopqrstuvwxyz]";
+  dquoted: "
ghijklmnopqrstuvwxyz";
+  dquoted: "
ghijklmnopqrstuvwxyz";
+  dquoted: "['
ghijklmnopqrstuvwxyz']";
+  squoted: "
ghijklmnopqrstuvwxyz";
+  squoted: "[
ghijklmnopqrstuvwxyz]";
+  squoted: "
ghijklmnopqrstuvwxyz";
+  squoted: "
ghijklmnopqrstuvwxyz";
+  squoted: "['
ghijklmnopqrstuvwxyz']";
+}
diff --git a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx
index ad84182fbe..56c38b7dca 100644
--- a/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx
@@ -14,16 +14,16 @@ $input: '\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z';
 
 <===> output.css
 .result {
-  output: "[\#{'\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z'}]";
-  output: "\#{'\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z'}";
+  output: "[#{'\b\c\d\e\fghijklmnopqrstuvwxyz'}]";
+  output: "#{'\b\c\d\e\fghijklmnopqrstuvwxyz'}";
   output: "#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}";
-  output: "['\#{'\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z'}']";
+  output: "['#{'\b\c\d\e\fghijklmnopqrstuvwxyz'}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "[#{'\b\c\d\e\fghijklmnopqrstuvwxyz'}]";
-  output: "#{'\b\c\d\e\fghijklmnopqrstuvwxyz'}";
+  output: "[\#{'\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z'}]";
+  output: "\#{'\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z'}";
   output: "#{" \b \c \d \e \f ghijklmnopqrstuvwxyz "}";
-  output: "['#{'\b\c\d\e\fghijklmnopqrstuvwxyz'}']";
+  output: "['\#{'\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z'}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx
index 6721a924b1..1186ec7a7b 100644
--- a/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: \B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z;
 }
 
 <===> output.css
-.result {
-  output: "[\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}]";
-  output: "\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}";
-  output: '\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}';
-  output: "['\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ}]";
   output: "#{\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ}";
   output: "#{\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ}";
   output: "['#{\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}]";
+  output: "\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}";
+  output: '\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}';
+  output: "['\#{\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx
index c36a35c04e..bc57f4d4c8 100644
--- a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx
@@ -9,16 +9,6 @@
 }
 
 <===> output.css
-.result {
-  output: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
-  output: 
GHIJKLMNOPQRSTUVWXYZ;
-  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: 
GHIJKLMNOPQRSTUVWXYZ;
@@ -27,3 +17,13 @@
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: "['\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
+  output: 
GHIJKLMNOPQRSTUVWXYZ;
+  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
+}
diff --git a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx
index 8980908e9d..eaba617770 100644
--- a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx
@@ -10,16 +10,6 @@ $input: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
 }
 
 <===> output.css
-.result {
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: 
GHIJKLMNOPQRSTUVWXYZ;
-  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: 
GHIJKLMNOPQRSTUVWXYZ;
@@ -28,3 +18,13 @@ $input: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: "['\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: 
GHIJKLMNOPQRSTUVWXYZ;
+  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
+}
diff --git a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx
index 24b79b6b41..f36b623b58 100644
--- a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx
+++ b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx
@@ -14,20 +14,6 @@ $input: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
 }
 
 <===> output.css
-.result {
-  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  dquoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  dquoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
-  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  squoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  squoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
-}
-
-<===> output-dart-sass.css
 .result {
   dquoted: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   dquoted: "[\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ]";
@@ -40,3 +26,17 @@ $input: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
   squoted: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   squoted: "['\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ']";
 }
+
+<===> output-libsass.css
+.result {
+  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  dquoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  dquoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
+  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  squoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  squoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
+}
diff --git a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx
index 33d2370219..9e66fb9ba5 100644
--- a/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx
@@ -16,14 +16,14 @@ $input: "\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z";
 .result {
   output: "[#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}]";
   output: "#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}";
-  output: '\#{"\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z"}';
+  output: '#{"\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ"}';
   output: "['#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
   output: "[#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}]";
   output: "#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}";
-  output: '#{"\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ"}';
+  output: '\#{"\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z"}';
   output: "['#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx
index c649ac7dbe..74527f9b3d 100644
--- a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx
@@ -9,16 +9,6 @@
 }
 
 <===> output.css
-.result {
-  output: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
-  output: 
GHIJKLMNOPQRSTUVWXYZ;
-  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: 
GHIJKLMNOPQRSTUVWXYZ;
@@ -27,3 +17,13 @@
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: "['\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ']";
 }
+
+<===> output-libsass.css
+.result {
+  output: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
+  output: 
GHIJKLMNOPQRSTUVWXYZ;
+  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
+}
diff --git a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx
index ec35597da2..49d04cb8f1 100644
--- a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx
@@ -10,16 +10,6 @@ $input: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
 }
 
 <===> output.css
-.result {
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: 
GHIJKLMNOPQRSTUVWXYZ;
-  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "
GHIJKLMNOPQRSTUVWXYZ";
-  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: 
GHIJKLMNOPQRSTUVWXYZ;
@@ -28,3 +18,13 @@ $input: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
   output: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   output: "['\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: 
GHIJKLMNOPQRSTUVWXYZ;
+  output: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "
GHIJKLMNOPQRSTUVWXYZ";
+  output: "['
GHIJKLMNOPQRSTUVWXYZ']";
+}
diff --git a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx
index e5f8221a72..2b35036885 100644
--- a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx
+++ b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx
@@ -14,20 +14,6 @@ $input: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
 }
 
 <===> output.css
-.result {
-  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  dquoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  dquoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
-  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  squoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
-  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
-  squoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
-}
-
-<===> output-dart-sass.css
 .result {
   dquoted: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   dquoted: "[\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ]";
@@ -40,3 +26,17 @@ $input: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
   squoted: "\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ";
   squoted: "['\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ']";
 }
+
+<===> output-libsass.css
+.result {
+  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  dquoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  dquoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  dquoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
+  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  squoted: "[
GHIJKLMNOPQRSTUVWXYZ]";
+  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  squoted: "
GHIJKLMNOPQRSTUVWXYZ";
+  squoted: "['
GHIJKLMNOPQRSTUVWXYZ']";
+}
diff --git a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx
index df1caa2f3f..4bda9dd889 100644
--- a/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx
@@ -14,16 +14,16 @@ $input: '\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z';
 
 <===> output.css
 .result {
-  output: "[\#{'\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z'}]";
-  output: "\#{'\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z'}";
+  output: "[#{'\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ'}]";
+  output: "#{'\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ'}";
   output: "#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}";
-  output: "['\#{'\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z'}']";
+  output: "['#{'\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ'}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "[#{'\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ'}]";
-  output: "#{'\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ'}";
+  output: "[\#{'\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z'}]";
+  output: "\#{'\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z'}";
   output: "#{" \b \c \d \e \f GHIJKLMNOPQRSTUVWXYZ "}";
-  output: "['#{'\b\c\d\e\fGHIJKLMNOPQRSTUVWXYZ'}']";
+  output: "['\#{'\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z'}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css
deleted file mode 100644
index 81de82d48f..0000000000
--- a/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-.result {
-  output: "[#{�_\a_\a}]";
-  output: "#{�_\a_\a}";
-  output: "#{�_\a_\a}";
-  output: "['#{�_\a_\a}']";
-}
diff --git a/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-libsass.css b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-libsass.css
new file mode 100644
index 0000000000..75f561e052
--- /dev/null
+++ b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-libsass.css
@@ -0,0 +1,6 @@
+.result {
+  output: "[\#{\0_\a_\A}]";
+  output: "\#{\0_\a_\A}";
+  output: '\#{\0_\a_\A}';
+  output: "['\#{\0_\a_\A}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css
index 75f561e052..81de82d48f 100644
--- a/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css
+++ b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css
@@ -1,6 +1,7 @@
+@charset "UTF-8";
 .result {
-  output: "[\#{\0_\a_\A}]";
-  output: "\#{\0_\a_\A}";
-  output: '\#{\0_\a_\A}';
-  output: "['\#{\0_\a_\A}']";
+  output: "[#{�_\a_\a}]";
+  output: "#{�_\a_\a}";
+  output: "#{�_\a_\a}";
+  output: "['#{�_\a_\a}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-libsass.css
similarity index 86%
rename from spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-libsass.css
index 1fb014eae0..4e0872242c 100644
--- a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css
+++ b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-libsass.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 .result {
-  output: "�_\a_\a";
+  output: "\0_\a_\A";
   output: �_ _ ;
   output: "[�_\a_\a]";
   output: "�_\a_\a";
diff --git a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css
index 4e0872242c..1fb014eae0 100644
--- a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css
+++ b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 .result {
-  output: "\0_\a_\A";
+  output: "�_\a_\a";
   output: �_ _ ;
   output: "[�_\a_\a]";
   output: "�_\a_\a";
diff --git a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-libsass.css
similarity index 71%
rename from spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-libsass.css
index fe1d4dd13a..0e01fbcef6 100644
--- a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css
+++ b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-libsass.css
@@ -1,7 +1,6 @@
-@charset "UTF-8";
 .result {
   output: "[#{" \0 _\a _\a  "}]";
   output: "#{" \0 _\a _\a  "}";
-  output: '#{"�_\a_\a"}';
+  output: '\#{"\0_\a_\A"}';
   output: "['#{" \0 _\a _\a  "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css
index 0e01fbcef6..fe1d4dd13a 100644
--- a/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css
+++ b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css
@@ -1,6 +1,7 @@
+@charset "UTF-8";
 .result {
   output: "[#{" \0 _\a _\a  "}]";
   output: "#{" \0 _\a _\a  "}";
-  output: '\#{"\0_\a_\A"}';
+  output: '#{"�_\a_\a"}';
   output: "['#{" \0 _\a _\a  "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-libsass.css
similarity index 86%
rename from spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-libsass.css
index 1fb014eae0..5a98fccef0 100644
--- a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css
+++ b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-libsass.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 .result {
-  output: "�_\a_\a";
+  output: '\0_\a_\A';
   output: �_ _ ;
   output: "[�_\a_\a]";
   output: "�_\a_\a";
diff --git a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css
index 5a98fccef0..1fb014eae0 100644
--- a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css
+++ b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 .result {
-  output: '\0_\a_\A';
+  output: "�_\a_\a";
   output: �_ _ ;
   output: "[�_\a_\a]";
   output: "�_\a_\a";
diff --git a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css
deleted file mode 100644
index ba603b05cf..0000000000
--- a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "UTF-8";
-.result {
-  output: "[#{'�_\a_\a'}]";
-  output: "#{'�_\a_\a'}";
-  output: "#{" \0 _\a _\a  "}";
-  output: "['#{'�_\a_\a'}']";
-}
diff --git a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-libsass.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-libsass.css
new file mode 100644
index 0000000000..e3410285c4
--- /dev/null
+++ b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-libsass.css
@@ -0,0 +1,6 @@
+.result {
+  output: "[\#{'\0_\a_\A'}]";
+  output: "\#{'\0_\a_\A'}";
+  output: "#{" \0 _\a _\a  "}";
+  output: "['\#{'\0_\a_\A'}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css
index e3410285c4..ba603b05cf 100644
--- a/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css
+++ b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css
@@ -1,6 +1,7 @@
+@charset "UTF-8";
 .result {
-  output: "[\#{'\0_\a_\A'}]";
-  output: "\#{'\0_\a_\A'}";
+  output: "[#{'�_\a_\a'}]";
+  output: "#{'�_\a_\a'}";
   output: "#{" \0 _\a _\a  "}";
-  output: "['\#{'\0_\a_\A'}']";
+  output: "['#{'�_\a_\a'}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx
index 45cefb1162..bb2347ba5e 100644
--- a/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx
@@ -8,17 +8,17 @@ $input: \"\';
 }
 
 <===> output.css
-.result {
-  output: "[\#{\"\'}]";
-  output: "\#{\"\'}";
-  output: '\#{\"\'}';
-  output: "['\#{\"\'}']";
-}
-
-<===> output-dart-sass.css
 .result {
   output: "[#{\"'}]";
   output: "#{\"'}";
   output: "#{\"'}";
   output: "['#{\"'}']";
 }
+
+<===> output-libsass.css
+.result {
+  output: "[\#{\"\'}]";
+  output: "\#{\"\'}";
+  output: '\#{\"\'}';
+  output: "['\#{\"\'}']";
+}
diff --git a/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/01_inline.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/01_inline.hrx
index ac3ea93438..63977be7fb 100644
--- a/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: "\"";
+  output: '"';
   output: ";
   output: '["]';
   output: '"';
@@ -18,9 +18,9 @@
   output: "['\"']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: '"';
+  output: "\"";
   output: ";
   output: '["]';
   output: '"';
diff --git a/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx
index 48e1e737fe..c4e741c476 100644
--- a/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx
@@ -11,14 +11,14 @@ $input: "\"";
 .result {
   output: "[#{" \" "}]";
   output: "#{" \" "}";
-  output: '\#{"\""}';
+  output: '#{"""}';
   output: "['#{" \" "}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
   output: "[#{" \" "}]";
   output: "#{" \" "}";
-  output: '#{"""}';
+  output: '\#{"\""}';
   output: "['#{" \" "}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/01_inline.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/01_inline.hrx
index 39be03c019..9fa38860a7 100644
--- a/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/01_inline.hrx
+++ b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/01_inline.hrx
@@ -10,7 +10,7 @@
 
 <===> output.css
 .result {
-  output: '\'';
+  output: "'";
   output: ';
   output: "[']";
   output: "'";
@@ -18,9 +18,9 @@
   output: "[''']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "'";
+  output: '\'';
   output: ';
   output: "[']";
   output: "'";
diff --git a/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx
index b9ee1aefc7..23a5e6c0fb 100644
--- a/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx
+++ b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx
@@ -9,16 +9,16 @@ $input: '\'';
 
 <===> output.css
 .result {
-  output: "[\#{'\''}]";
-  output: "\#{'\''}";
+  output: "[#{'''}]";
+  output: "#{'''}";
   output: "#{" \' "}";
-  output: "['\#{'\''}']";
+  output: "['#{'''}']";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .result {
-  output: "[#{'''}]";
-  output: "#{'''}";
+  output: "[\#{'\''}]";
+  output: "\#{'\''}";
   output: "#{" \' "}";
-  output: "['#{'''}']";
+  output: "['\#{'\''}']";
 }
diff --git a/spec/non_conformant/parser/interpolate/44_selector/colon_twice_todo.hrx b/spec/non_conformant/parser/interpolate/44_selector/colon_twice_todo.hrx
index 95227c449d..e0b7a4ad63 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/colon_twice_todo.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/colon_twice_todo.hrx
@@ -9,14 +9,14 @@ test {
 }
 
 <===> error
-Error: Invalid CSS after "  filter: progid": expected ";", was ":DXImageTransfo..."
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected "(".
   ,
 2 |   filter: progid:DXImageTransform.Microsoft.#{Alpha(opacity=20)};
   |                                             ^
   '
   input.scss 2:45  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "  filter: progid": expected ";", was ":DXImageTransfo..."
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx b/spec/non_conformant/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx
index e4fb56b3f5..bff8dba52e 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx
@@ -4,10 +4,10 @@ $key: 'bar';
 
 <===> output.css
 .test12\@bar {
-  content: '1.2';
+  content: "1.2";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .test12\@bar {
-  content: "1.2";
+  content: '1.2';
 }
diff --git a/spec/non_conformant/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx b/spec/non_conformant/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx
index b54c73b4c1..8a6d7470c7 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx
@@ -5,10 +5,10 @@ $suffix2: '\\@#{$key}';
 
 <===> output.css
 .test22\@bar {
-  content: '2.2';
+  content: "2.2";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .test22\@bar {
-  content: "2.2";
+  content: '2.2';
 }
diff --git a/spec/non_conformant/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx b/spec/non_conformant/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx
index 8363c62d06..1ddad10fa2 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx
@@ -3,10 +3,10 @@
 
 <===> output.css
 .test32\@baz {
-  content: '3.2';
+  content: "3.2";
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 .test32\@baz {
-  content: "3.2";
+  content: '3.2';
 }
diff --git a/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx
index f81b147da9..580fcbac0a 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx
@@ -3,14 +3,14 @@ $key: 'bar';
 .test11#{'\@#{$key}'} { content: '1.1'; }
 
 <===> error
-Error: Invalid CSS after ".test11": expected selector, was "@bar"
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 2 | .test11@bar{ content: '1.1'; }
   |        ^
   '
   input.scss 2:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after ".test11": expected selector, was "@bar"
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx
index fae83b3cab..0d62c989f5 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx
@@ -4,14 +4,14 @@ $suffix1: '\@#{$key}';
 .test21#{$suffix1} { content: '2.1'; }
 
 <===> error
-Error: Invalid CSS after ".test21": expected selector, was "@bar"
-        on line 3 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 3 | .test21@bar{ content: '2.1'; }
   |        ^
   '
   input.scss 3:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after ".test21": expected selector, was "@bar"
+        on line 3 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx
index 9e9f73cf48..ce99df652f 100644
--- a/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx
+++ b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx
@@ -2,14 +2,14 @@
 .test31#{'\@baz'} { content: '3.1'; }
 
 <===> error
-Error: Invalid CSS after ".test31": expected selector, was "@baz"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected selector.
   ,
 1 | .test31@baz{ content: '3.1'; }
   |        ^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after ".test31": expected selector, was "@baz"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/parser/malformed_expressions/at-debug/incomplete-expression.hrx b/spec/non_conformant/parser/malformed_expressions/at-debug/incomplete-expression.hrx
index a17349f186..efa9a6f8f0 100644
--- a/spec/non_conformant/parser/malformed_expressions/at-debug/incomplete-expression.hrx
+++ b/spec/non_conformant/parser/malformed_expressions/at-debug/incomplete-expression.hrx
@@ -2,12 +2,12 @@
 @debug("foo";
 
 <===> error
-Error: Invalid CSS after "@debug("foo"": expected ")", was ";"
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | @debug("foo";
   |             ^
   '
   input.scss 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@debug("foo"": expected ")", was ";"
diff --git a/spec/non_conformant/parser/malformed_expressions/at-debug/no-argument.hrx b/spec/non_conformant/parser/malformed_expressions/at-debug/no-argument.hrx
index f0aa80346c..6fb037b4a5 100644
--- a/spec/non_conformant/parser/malformed_expressions/at-debug/no-argument.hrx
+++ b/spec/non_conformant/parser/malformed_expressions/at-debug/no-argument.hrx
@@ -2,12 +2,12 @@
 @debug;
 
 <===> error
-Error: Invalid CSS after "@debug": expected expression (e.g. 1px, bold), was ";"
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @debug;
   |       ^
   '
   input.scss 1:7  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@debug": expected expression (e.g. 1px, bold), was ";"
diff --git a/spec/non_conformant/parser/malformed_expressions/at-error/incomplete-expression.hrx b/spec/non_conformant/parser/malformed_expressions/at-error/incomplete-expression.hrx
index ee2c6858ec..0709cc4788 100644
--- a/spec/non_conformant/parser/malformed_expressions/at-error/incomplete-expression.hrx
+++ b/spec/non_conformant/parser/malformed_expressions/at-error/incomplete-expression.hrx
@@ -2,12 +2,12 @@
 @error("foo";
 
 <===> error
-Error: Invalid CSS after "@error("foo"": expected ")", was ";"
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | @error("foo";
   |             ^
   '
   input.scss 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@error("foo"": expected ")", was ";"
diff --git a/spec/non_conformant/parser/malformed_expressions/at-error/no-argument.hrx b/spec/non_conformant/parser/malformed_expressions/at-error/no-argument.hrx
index db29841c82..268a1fc010 100644
--- a/spec/non_conformant/parser/malformed_expressions/at-error/no-argument.hrx
+++ b/spec/non_conformant/parser/malformed_expressions/at-error/no-argument.hrx
@@ -2,12 +2,12 @@
 @error;
 
 <===> error
-Error: Invalid CSS after "@error": expected expression (e.g. 1px, bold), was ";"
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @error;
   |       ^
   '
   input.scss 1:7  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@error": expected expression (e.g. 1px, bold), was ";"
diff --git a/spec/non_conformant/parser/malformed_expressions/at-warn/incomplete-expression.hrx b/spec/non_conformant/parser/malformed_expressions/at-warn/incomplete-expression.hrx
index f5b950ae02..2095df124f 100644
--- a/spec/non_conformant/parser/malformed_expressions/at-warn/incomplete-expression.hrx
+++ b/spec/non_conformant/parser/malformed_expressions/at-warn/incomplete-expression.hrx
@@ -2,12 +2,12 @@
 @warn("foo";
 
 <===> error
-Error: Invalid CSS after "@warn("foo"": expected ")", was ";"
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | @warn("foo";
   |            ^
   '
   input.scss 1:12  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@warn("foo"": expected ")", was ";"
diff --git a/spec/non_conformant/parser/malformed_expressions/at-warn/no-argument.hrx b/spec/non_conformant/parser/malformed_expressions/at-warn/no-argument.hrx
index a2f290775a..179b395b8c 100644
--- a/spec/non_conformant/parser/malformed_expressions/at-warn/no-argument.hrx
+++ b/spec/non_conformant/parser/malformed_expressions/at-warn/no-argument.hrx
@@ -2,12 +2,12 @@
 @warn;
 
 <===> error
-Error: Invalid CSS after "@warn": expected expression (e.g. 1px, bold), was ";"
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @warn;
   |      ^
   '
   input.scss 1:6  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@warn": expected expression (e.g. 1px, bold), was ";"
diff --git a/spec/non_conformant/parser/operations/addition/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/addition/dimensions/pairs.hrx
index e98ce64c7a..c2fd16dfba 100644
--- a/spec/non_conformant/parser/operations/addition/dimensions/pairs.hrx
+++ b/spec/non_conformant/parser/operations/addition/dimensions/pairs.hrx
@@ -94,11 +94,11 @@ foo {
 <===> output.css
 foo {
   test-1: 20;
-  test-2: 10 +10;
+  test-2: 20;
   test-3: 20;
   test-4: 20;
   test-5: 20px;
-  test-6: 10 +10px;
+  test-6: 20px;
   test-7: 20px;
   test-8: 20px;
   test-9: 1010px;
@@ -118,7 +118,7 @@ foo {
   test-23: 20 px;
   test-24: 20 px;
   test-25: 20px;
-  test-26: 10px +10px;
+  test-26: 20px;
   test-27: 20px;
   test-28: 20px;
   test-29: 10px10px;
@@ -179,14 +179,14 @@ foo {
   test-84: 10 px10 px;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   test-1: 20;
-  test-2: 20;
+  test-2: 10 +10;
   test-3: 20;
   test-4: 20;
   test-5: 20px;
-  test-6: 20px;
+  test-6: 10 +10px;
   test-7: 20px;
   test-8: 20px;
   test-9: 1010px;
@@ -206,7 +206,7 @@ foo {
   test-23: 20 px;
   test-24: 20 px;
   test-25: 20px;
-  test-26: 20px;
+  test-26: 10px +10px;
   test-27: 20px;
   test-28: 20px;
   test-29: 10px10px;
diff --git a/spec/non_conformant/parser/operations/addition/numbers/pairs.hrx b/spec/non_conformant/parser/operations/addition/numbers/pairs.hrx
index 8b72bf4f7b..16c94e779c 100644
--- a/spec/non_conformant/parser/operations/addition/numbers/pairs.hrx
+++ b/spec/non_conformant/parser/operations/addition/numbers/pairs.hrx
@@ -50,7 +50,7 @@ foo {
 <===> output.css
 foo {
   test-1: 20;
-  test-2: 10 +10;
+  test-2: 20;
   test-3: 20;
   test-4: 20;
   test-5: 1010;
@@ -91,10 +91,10 @@ foo {
   test-40: 1010;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   test-1: 20;
-  test-2: 20;
+  test-2: 10 +10;
   test-3: 20;
   test-4: 20;
   test-5: 1010;
diff --git a/spec/non_conformant/parser/operations/division/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/division/dimensions/pairs.hrx
index 405a386702..8489caeb53 100644
--- a/spec/non_conformant/parser/operations/division/dimensions/pairs.hrx
+++ b/spec/non_conformant/parser/operations/division/dimensions/pairs.hrx
@@ -94,13 +94,13 @@ foo {
 <===> output.css
 foo {
   test-1: 10/10;
-  test-2: 10 /10;
-  test-3: 10/ 10;
-  test-4: 10 / 10;
+  test-2: 10/10;
+  test-3: 10/10;
+  test-4: 10/10;
   test-5: 10/10px;
-  test-6: 10 /10px;
-  test-7: 10/ 10px;
-  test-8: 10 / 10px;
+  test-6: 10/10px;
+  test-7: 10/10px;
+  test-8: 10/10px;
   test-9: 10/10px;
   test-10: 10/10px;
   test-11: 10/10px;
@@ -118,9 +118,9 @@ foo {
   test-23: 10/10 px;
   test-24: 10/10 px;
   test-25: 10px/10px;
-  test-26: 10px /10px;
-  test-27: 10px/ 10px;
-  test-28: 10px / 10px;
+  test-26: 10px/10px;
+  test-27: 10px/10px;
+  test-28: 10px/10px;
   test-29: 10px/10px;
   test-30: 10px/10px;
   test-31: 10px/10px;
@@ -179,16 +179,16 @@ foo {
   test-84: 10 px/10 px;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   test-1: 10/10;
-  test-2: 10/10;
-  test-3: 10/10;
-  test-4: 10/10;
+  test-2: 10 /10;
+  test-3: 10/ 10;
+  test-4: 10 / 10;
   test-5: 10/10px;
-  test-6: 10/10px;
-  test-7: 10/10px;
-  test-8: 10/10px;
+  test-6: 10 /10px;
+  test-7: 10/ 10px;
+  test-8: 10 / 10px;
   test-9: 10/10px;
   test-10: 10/10px;
   test-11: 10/10px;
@@ -206,9 +206,9 @@ foo {
   test-23: 10/10 px;
   test-24: 10/10 px;
   test-25: 10px/10px;
-  test-26: 10px/10px;
-  test-27: 10px/10px;
-  test-28: 10px/10px;
+  test-26: 10px /10px;
+  test-27: 10px/ 10px;
+  test-28: 10px / 10px;
   test-29: 10px/10px;
   test-30: 10px/10px;
   test-31: 10px/10px;
diff --git a/spec/non_conformant/parser/operations/division/mixed/pairs.hrx b/spec/non_conformant/parser/operations/division/mixed/pairs.hrx
index 6289c14d3f..c90d989756 100644
--- a/spec/non_conformant/parser/operations/division/mixed/pairs.hrx
+++ b/spec/non_conformant/parser/operations/division/mixed/pairs.hrx
@@ -66,49 +66,49 @@ foo {
 <===> output.css
 foo {
   test-1: 10/10;
-  test-2: 10 /10;
-  test-3: 10/ 10;
-  test-4: 10 / 10;
+  test-2: 10/10;
+  test-3: 10/10;
+  test-4: 10/10;
   test-5: 10/10%;
-  test-6: 10 /10%;
-  test-7: 10/ 10%;
-  test-8: 10 / 10%;
+  test-6: 10/10%;
+  test-7: 10/10%;
+  test-8: 10/10%;
   test-9: 10/10px;
-  test-10: 10 /10px;
-  test-11: 10/ 10px;
-  test-12: 10 / 10px;
+  test-10: 10/10px;
+  test-11: 10/10px;
+  test-12: 10/10px;
   test-13: 10/#AAA;
-  test-14: 10 /#AAA;
-  test-15: 10/ #AAA;
-  test-16: 10 / #AAA;
+  test-14: 10/#AAA;
+  test-15: 10/#AAA;
+  test-16: 10/#AAA;
   test-17: 10/itpl;
   test-18: 10/itpl;
   test-19: 10/itpl;
   test-20: 10/itpl;
   test-21: 10%/10%;
-  test-22: 10% /10%;
-  test-23: 10%/ 10%;
-  test-24: 10% / 10%;
+  test-22: 10%/10%;
+  test-23: 10%/10%;
+  test-24: 10%/10%;
   test-25: 10%/10px;
-  test-26: 10% /10px;
-  test-27: 10%/ 10px;
-  test-28: 10% / 10px;
+  test-26: 10%/10px;
+  test-27: 10%/10px;
+  test-28: 10%/10px;
   test-29: 10%/#AAA;
-  test-30: 10% /#AAA;
-  test-31: 10%/ #AAA;
-  test-32: 10% / #AAA;
+  test-30: 10%/#AAA;
+  test-31: 10%/#AAA;
+  test-32: 10%/#AAA;
   test-33: 10%/itpl;
   test-34: 10%/itpl;
   test-35: 10%/itpl;
   test-36: 10%/itpl;
   test-37: 10px/10px;
-  test-38: 10px /10px;
-  test-39: 10px/ 10px;
-  test-40: 10px / 10px;
+  test-38: 10px/10px;
+  test-39: 10px/10px;
+  test-40: 10px/10px;
   test-41: 10px/#AAA;
-  test-42: 10px /#AAA;
-  test-43: 10px/ #AAA;
-  test-44: 10px / #AAA;
+  test-42: 10px/#AAA;
+  test-43: 10px/#AAA;
+  test-44: 10px/#AAA;
   test-45: 10px/itpl;
   test-46: 10px/itpl;
   test-47: 10px/itpl;
@@ -123,52 +123,52 @@ foo {
   test-56: itpl/itpl;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   test-1: 10/10;
-  test-2: 10/10;
-  test-3: 10/10;
-  test-4: 10/10;
+  test-2: 10 /10;
+  test-3: 10/ 10;
+  test-4: 10 / 10;
   test-5: 10/10%;
-  test-6: 10/10%;
-  test-7: 10/10%;
-  test-8: 10/10%;
+  test-6: 10 /10%;
+  test-7: 10/ 10%;
+  test-8: 10 / 10%;
   test-9: 10/10px;
-  test-10: 10/10px;
-  test-11: 10/10px;
-  test-12: 10/10px;
+  test-10: 10 /10px;
+  test-11: 10/ 10px;
+  test-12: 10 / 10px;
   test-13: 10/#AAA;
-  test-14: 10/#AAA;
-  test-15: 10/#AAA;
-  test-16: 10/#AAA;
+  test-14: 10 /#AAA;
+  test-15: 10/ #AAA;
+  test-16: 10 / #AAA;
   test-17: 10/itpl;
   test-18: 10/itpl;
   test-19: 10/itpl;
   test-20: 10/itpl;
   test-21: 10%/10%;
-  test-22: 10%/10%;
-  test-23: 10%/10%;
-  test-24: 10%/10%;
+  test-22: 10% /10%;
+  test-23: 10%/ 10%;
+  test-24: 10% / 10%;
   test-25: 10%/10px;
-  test-26: 10%/10px;
-  test-27: 10%/10px;
-  test-28: 10%/10px;
+  test-26: 10% /10px;
+  test-27: 10%/ 10px;
+  test-28: 10% / 10px;
   test-29: 10%/#AAA;
-  test-30: 10%/#AAA;
-  test-31: 10%/#AAA;
-  test-32: 10%/#AAA;
+  test-30: 10% /#AAA;
+  test-31: 10%/ #AAA;
+  test-32: 10% / #AAA;
   test-33: 10%/itpl;
   test-34: 10%/itpl;
   test-35: 10%/itpl;
   test-36: 10%/itpl;
   test-37: 10px/10px;
-  test-38: 10px/10px;
-  test-39: 10px/10px;
-  test-40: 10px/10px;
+  test-38: 10px /10px;
+  test-39: 10px/ 10px;
+  test-40: 10px / 10px;
   test-41: 10px/#AAA;
-  test-42: 10px/#AAA;
-  test-43: 10px/#AAA;
-  test-44: 10px/#AAA;
+  test-42: 10px /#AAA;
+  test-43: 10px/ #AAA;
+  test-44: 10px / #AAA;
   test-45: 10px/itpl;
   test-46: 10px/itpl;
   test-47: 10px/itpl;
diff --git a/spec/non_conformant/parser/operations/division/numbers/pairs.hrx b/spec/non_conformant/parser/operations/division/numbers/pairs.hrx
index 5753f48cfb..655942f9a9 100644
--- a/spec/non_conformant/parser/operations/division/numbers/pairs.hrx
+++ b/spec/non_conformant/parser/operations/division/numbers/pairs.hrx
@@ -50,9 +50,9 @@ foo {
 <===> output.css
 foo {
   test-1: 10/10;
-  test-2: 10 /10;
-  test-3: 10/ 10;
-  test-4: 10 / 10;
+  test-2: 10/10;
+  test-3: 10/10;
+  test-4: 10/10;
   test-5: 10/10;
   test-6: 10/10;
   test-7: 10/10;
@@ -91,12 +91,12 @@ foo {
   test-40: 10/10;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   test-1: 10/10;
-  test-2: 10/10;
-  test-3: 10/10;
-  test-4: 10/10;
+  test-2: 10 /10;
+  test-3: 10/ 10;
+  test-4: 10 / 10;
   test-5: 10/10;
   test-6: 10/10;
   test-7: 10/10;
diff --git a/spec/non_conformant/parser/operations/division/strings/pairs.hrx b/spec/non_conformant/parser/operations/division/strings/pairs.hrx
index 889ce8f208..69fbb6b8dc 100644
--- a/spec/non_conformant/parser/operations/division/strings/pairs.hrx
+++ b/spec/non_conformant/parser/operations/division/strings/pairs.hrx
@@ -70,13 +70,13 @@ foo {
 <===> output.css
 foo {
   test-1: literal/literal;
-  test-2: literal /literal;
-  test-3: literal/ literal;
-  test-4: literal / literal;
+  test-2: literal/literal;
+  test-3: literal/literal;
+  test-4: literal/literal;
   test-5: literal/"quoted";
-  test-6: literal /"quoted";
-  test-7: literal/ "quoted";
-  test-8: literal / "quoted";
+  test-6: literal/"quoted";
+  test-7: literal/"quoted";
+  test-8: literal/"quoted";
   test-9: literal/interpolant;
   test-10: literal/interpolant;
   test-11: literal/interpolant;
@@ -90,9 +90,9 @@ foo {
   test-19: literal/litlp_rschema;
   test-20: literal/litlp_rschema;
   test-21: "quoted"/"quoted";
-  test-22: "quoted" /"quoted";
-  test-23: "quoted"/ "quoted";
-  test-24: "quoted" / "quoted";
+  test-22: "quoted"/"quoted";
+  test-23: "quoted"/"quoted";
+  test-24: "quoted"/"quoted";
   test-25: "quoted"/interpolant;
   test-26: "quoted"/interpolant;
   test-27: "quoted"/interpolant;
@@ -131,16 +131,16 @@ foo {
   test-60: litlp_rschema/litlp_rschema;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   test-1: literal/literal;
-  test-2: literal/literal;
-  test-3: literal/literal;
-  test-4: literal/literal;
+  test-2: literal /literal;
+  test-3: literal/ literal;
+  test-4: literal / literal;
   test-5: literal/"quoted";
-  test-6: literal/"quoted";
-  test-7: literal/"quoted";
-  test-8: literal/"quoted";
+  test-6: literal /"quoted";
+  test-7: literal/ "quoted";
+  test-8: literal / "quoted";
   test-9: literal/interpolant;
   test-10: literal/interpolant;
   test-11: literal/interpolant;
@@ -154,9 +154,9 @@ foo {
   test-19: literal/litlp_rschema;
   test-20: literal/litlp_rschema;
   test-21: "quoted"/"quoted";
-  test-22: "quoted"/"quoted";
-  test-23: "quoted"/"quoted";
-  test-24: "quoted"/"quoted";
+  test-22: "quoted" /"quoted";
+  test-23: "quoted"/ "quoted";
+  test-24: "quoted" / "quoted";
   test-25: "quoted"/interpolant;
   test-26: "quoted"/interpolant;
   test-27: "quoted"/interpolant;
diff --git a/spec/non_conformant/sass/indentation.hrx b/spec/non_conformant/sass/indentation.hrx
index 6c552bb12d..f5b413ee80 100644
--- a/spec/non_conformant/sass/indentation.hrx
+++ b/spec/non_conformant/sass/indentation.hrx
@@ -93,14 +93,14 @@ a
  d: e
 
 <===> error/inconsistent/error
-Error: Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 4 spaces.
-        on line 3 of /sass/spec/sass/inconsistent_indentation/input.sass
-  Use --trace for backtrace.
-
-<===> error/inconsistent/error-dart-sass
 Error: Inconsistent indentation, expected 4 spaces.
   ,
 3 |  d: e
   | ^
   '
   input.sass 3:1  root stylesheet
+
+<===> error/inconsistent/error-libsass
+Error: Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 4 spaces.
+        on line 3 of /sass/spec/sass/inconsistent_indentation/input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/at_rule.hrx b/spec/non_conformant/sass/semicolon/at_rule.hrx
index dabb0bd909..ededbe11d5 100644
--- a/spec/non_conformant/sass/semicolon/at_rule.hrx
+++ b/spec/non_conformant/sass/semicolon/at_rule.hrx
@@ -2,14 +2,14 @@
 @rule value;
 
 <===> error
-Error: Invalid CSS after "value": expected newline, was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | @rule value;
   |            ^
   '
   input.sass 1:12  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "value": expected newline, was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/content.hrx b/spec/non_conformant/sass/semicolon/content.hrx
index 75d8f03a93..d5ca753628 100644
--- a/spec/non_conformant/sass/semicolon/content.hrx
+++ b/spec/non_conformant/sass/semicolon/content.hrx
@@ -3,14 +3,14 @@
   @content;
 
 <===> error
-Error: Invalid CSS after "@content": expected newline, was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 2 |   @content;
   |           ^
   '
   input.sass 2:11  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@content": expected newline, was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/debug.hrx b/spec/non_conformant/sass/semicolon/debug.hrx
index 23572bd688..ca2502a752 100644
--- a/spec/non_conformant/sass/semicolon/debug.hrx
+++ b/spec/non_conformant/sass/semicolon/debug.hrx
@@ -2,14 +2,14 @@
 @debug value;
 
 <===> error
-Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | @debug value;
   |             ^
   '
   input.sass 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/declaration.hrx b/spec/non_conformant/sass/semicolon/declaration.hrx
index 5a6ca6c044..00436957a6 100644
--- a/spec/non_conformant/sass/semicolon/declaration.hrx
+++ b/spec/non_conformant/sass/semicolon/declaration.hrx
@@ -3,14 +3,14 @@ a
   b: c;
 
 <===> error
-Error: Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"
-        on line 2 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 2 |   b: c;
   |       ^
   '
   input.sass 2:7  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"
+        on line 2 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/error.hrx b/spec/non_conformant/sass/semicolon/error.hrx
index 483e408138..994139cd53 100644
--- a/spec/non_conformant/sass/semicolon/error.hrx
+++ b/spec/non_conformant/sass/semicolon/error.hrx
@@ -2,14 +2,14 @@
 @error value;
 
 <===> error
-Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | @error value;
   |             ^
   '
   input.sass 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/import.hrx b/spec/non_conformant/sass/semicolon/import.hrx
index bfef468368..c03a8f2bd6 100644
--- a/spec/non_conformant/sass/semicolon/import.hrx
+++ b/spec/non_conformant/sass/semicolon/import.hrx
@@ -2,14 +2,14 @@
 @import url("foo");
 
 <===> error
-Error: Invalid CSS after "url("foo")": expected media query list, was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | @import url("foo");
   |                   ^
   '
   input.sass 1:19  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "url("foo")": expected media query list, was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/include.hrx b/spec/non_conformant/sass/semicolon/include.hrx
index 6df4280969..82b84a75c7 100644
--- a/spec/non_conformant/sass/semicolon/include.hrx
+++ b/spec/non_conformant/sass/semicolon/include.hrx
@@ -2,14 +2,14 @@
 @include foo;
 
 <===> error
-Error: Invalid CSS after "": expected expression (e.g. 1px, bold), was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | @include foo;
   |             ^
   '
   input.sass 1:13  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "": expected expression (e.g. 1px, bold), was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/return.hrx b/spec/non_conformant/sass/semicolon/return.hrx
index 9ca525c53b..36500b58e6 100644
--- a/spec/non_conformant/sass/semicolon/return.hrx
+++ b/spec/non_conformant/sass/semicolon/return.hrx
@@ -3,14 +3,14 @@
   @return value;
 
 <===> error
-Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
-        on line 2 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 2 |   @return value;
   |                ^
   '
   input.sass 2:16  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
+        on line 2 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/variable.hrx b/spec/non_conformant/sass/semicolon/variable.hrx
index cf71c27e9d..2fd638b1d4 100644
--- a/spec/non_conformant/sass/semicolon/variable.hrx
+++ b/spec/non_conformant/sass/semicolon/variable.hrx
@@ -2,14 +2,14 @@
 $var: value;
 
 <===> error
-Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | $var: value;
   |            ^
   '
   input.sass 1:12  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/semicolon/warn.hrx b/spec/non_conformant/sass/semicolon/warn.hrx
index ac229e5b02..57177ce6c3 100644
--- a/spec/non_conformant/sass/semicolon/warn.hrx
+++ b/spec/non_conformant/sass/semicolon/warn.hrx
@@ -2,14 +2,14 @@
 @warn value;
 
 <===> error
-Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
-        on line 1 of input.sass
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: semicolons aren't allowed in the indented syntax.
   ,
 1 | @warn value;
   |            ^
   '
   input.sass 1:12  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "value": expected expression (e.g. 1px, bold), was ";"
+        on line 1 of input.sass
+  Use --trace for backtrace.
diff --git a/spec/non_conformant/sass/var-args/error.hrx b/spec/non_conformant/sass/var-args/error.hrx
index b4902b3eec..4dbefb7d46 100644
--- a/spec/non_conformant/sass/var-args/error.hrx
+++ b/spec/non_conformant/sass/var-args/error.hrx
@@ -9,7 +9,18 @@ div {
   @include bar(a, c d e...);
 }
 
-<===> error-dart-sass
+<===> output-libsass.css
+div {
+  x: a;
+  y: c;
+  z: d;
+}
+
+<===> warning
+WARNING: Mixin bar takes 3 arguments but 4 were passed.
+        on line 8 of input.scss
+This will be an error in future versions of Sass.
+<===> error
 Error: Only 3 arguments allowed, but 4 were passed.
     ,
 1   | @mixin bar($x, $y, $z) {
@@ -20,15 +31,3 @@ Error: Only 3 arguments allowed, but 4 were passed.
     '
   input.scss 8:3  bar()
   input.scss 8:3  root stylesheet
-
-<===> output.css
-div {
-  x: a;
-  y: c;
-  z: d;
-}
-
-<===> warning
-WARNING: Mixin bar takes 3 arguments but 4 were passed.
-        on line 8 of input.scss
-This will be an error in future versions of Sass.
\ No newline at end of file
diff --git a/spec/non_conformant/scss-tests/019_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/019_test_css_import_directive.hrx
index 24f47ee4ce..04998d432a 100644
--- a/spec/non_conformant/scss-tests/019_test_css_import_directive.hrx
+++ b/spec/non_conformant/scss-tests/019_test_css_import_directive.hrx
@@ -1,7 +1,7 @@
 <===> input.scss
 @import "foo.css";
 <===> output.css
-@import url(foo.css);
-
-<===> output-dart-sass.css
 @import "foo.css";
+
+<===> output-libsass.css
+@import url(foo.css);
diff --git a/spec/non_conformant/scss-tests/020_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/020_test_css_import_directive.hrx
index 8cc8037304..0c567e097f 100644
--- a/spec/non_conformant/scss-tests/020_test_css_import_directive.hrx
+++ b/spec/non_conformant/scss-tests/020_test_css_import_directive.hrx
@@ -1,7 +1,7 @@
 <===> input.scss
 @import 'foo.css';
 <===> output.css
-@import url(foo.css);
-
-<===> output-dart-sass.css
 @import 'foo.css';
+
+<===> output-libsass.css
+@import url(foo.css);
diff --git a/spec/non_conformant/scss-tests/042_test_newlines_in_selectors.hrx b/spec/non_conformant/scss-tests/042_test_newlines_in_selectors.hrx
index 9252371ea9..17c933f6e9 100644
--- a/spec/non_conformant/scss-tests/042_test_newlines_in_selectors.hrx
+++ b/spec/non_conformant/scss-tests/042_test_newlines_in_selectors.hrx
@@ -7,20 +7,20 @@ bar {
   bip bop {c: d}}
 
 <===> output.css
-foo
-bar baz
-bang {
+foo bar baz bang {
   a: b;
 }
-foo
-bar bip bop {
+foo bar bip bop {
   c: d;
 }
 
-<===> output-dart-sass.css
-foo bar baz bang {
+<===> output-libsass.css
+foo
+bar baz
+bang {
   a: b;
 }
-foo bar bip bop {
+foo
+bar bip bop {
   c: d;
 }
diff --git a/spec/non_conformant/scss-tests/174_test_import_comments_in_imports.hrx b/spec/non_conformant/scss-tests/174_test_import_comments_in_imports.hrx
index 63214d29aa..ceb94941fc 100644
--- a/spec/non_conformant/scss-tests/174_test_import_comments_in_imports.hrx
+++ b/spec/non_conformant/scss-tests/174_test_import_comments_in_imports.hrx
@@ -4,11 +4,11 @@
         "baz.css"; // this is a third comment
 
 <===> output.css
-@import url(foo.css);
-@import url(bar.css);
-@import url(baz.css);
-
-<===> output-dart-sass.css
 @import "foo.css";
 @import "bar.css";
 @import "baz.css";
+
+<===> output-libsass.css
+@import url(foo.css);
+@import url(bar.css);
+@import url(baz.css);
diff --git a/spec/non_conformant/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx b/spec/non_conformant/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx
index 55622fc42e..2ec479f6b4 100644
--- a/spec/non_conformant/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx
+++ b/spec/non_conformant/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx
@@ -7,13 +7,13 @@ a
 }
 
 <===> output.css
-z a
-, z b {
+z a,
+z b {
   display: block;
 }
 
-<===> output-dart-sass.css
-z a,
-z b {
+<===> output-libsass.css
+z a
+, z b {
   display: block;
 }
diff --git a/spec/non_conformant/scss/alpha.hrx b/spec/non_conformant/scss/alpha.hrx
index 614a22fbc7..69d377c504 100644
--- a/spec/non_conformant/scss/alpha.hrx
+++ b/spec/non_conformant/scss/alpha.hrx
@@ -28,21 +28,21 @@ div {
   color: yellow;
   background: #7b2d06;
   grah: rgba(255, 0, 238, 0.5);
-  floo: cyan;
-  groo: cyan;
+  floo: aqua;
+  groo: aqua;
   hoo: 123;
   moo: 45;
   poo: 6;
   boo: #edcba9;
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 div {
   color: yellow;
   background: #7b2d06;
   grah: rgba(255, 0, 238, 0.5);
-  floo: aqua;
-  groo: aqua;
+  floo: cyan;
+  groo: cyan;
   hoo: 123;
   moo: 45;
   poo: 6;
diff --git a/spec/non_conformant/scss/ie-functions.hrx b/spec/non_conformant/scss/ie-functions.hrx
index 5983c47017..8379d17cf4 100644
--- a/spec/non_conformant/scss/ie-functions.hrx
+++ b/spec/non_conformant/scss/ie-functions.hrx
@@ -61,7 +61,7 @@ foo {
   left: expression(document.body.clientWidth/2-oDiv.offsetWidth/2);
   flop: expression(document.body.clientHeight/2-oDiv.offsetHeight/2);
   left: expression(document.body.clientWidth/4);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFF0000', endColorstr='#FF008000', GradientType=1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#FFFF0000", endColorstr="#FF008000", GradientType=1);
 }
 
 .parser {
@@ -70,12 +70,12 @@ foo {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#550000FF, endColorstr=#55FFFF00);
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1) progid:DXImageTransform.Microsoft.Alpha(opacity=50) progid:DXImageTransform.Microsoft.Blur(strength=10);
   filter: progid:DXImageTransform.Microsoft.Wave(strength=100) progid:DXImageTransform.Microsoft.CheckerBoard(duration=4);
-  filter: progid:DXImageTransform.Microsoft.Wave(strength=100) progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1) progid:DXImageTransform.Microsoft.Iris(irisstyle='STAR', duration=4);
+  filter: progid:DXImageTransform.Microsoft.Wave(strength=100) progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1) progid:DXImageTransform.Microsoft.Iris(irisstyle="STAR", duration=4);
   filter: progid:DXImageTransform.Microsoft.MotionBlur(strength=13, direction=310) progid:DXImageTransform.Microsoft.Blur(pixelradius=2) progid:DXImageTransform.Microsoft.Wheel(duration=3);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled='false', startColorstr=#550000FF, endColorstr=#55FFFF00);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled="false", startColorstr=#550000FF, endColorstr=#55FFFF00);
 }
 
-<===> output-dart-sass.css
+<===> output-libsass.css
 foo {
   filter: progid:Microsoft.foo.bar.Baz(flip=foobar, bang=#00ff00cc);
   something: blah(hux=mumble);
@@ -89,7 +89,7 @@ foo {
   left: expression(document.body.clientWidth/2-oDiv.offsetWidth/2);
   flop: expression(document.body.clientHeight/2-oDiv.offsetHeight/2);
   left: expression(document.body.clientWidth/4);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#FFFF0000", endColorstr="#FF008000", GradientType=1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFF0000', endColorstr='#FF008000', GradientType=1);
 }
 
 .parser {
@@ -98,9 +98,9 @@ foo {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#550000FF, endColorstr=#55FFFF00);
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1) progid:DXImageTransform.Microsoft.Alpha(opacity=50) progid:DXImageTransform.Microsoft.Blur(strength=10);
   filter: progid:DXImageTransform.Microsoft.Wave(strength=100) progid:DXImageTransform.Microsoft.CheckerBoard(duration=4);
-  filter: progid:DXImageTransform.Microsoft.Wave(strength=100) progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1) progid:DXImageTransform.Microsoft.Iris(irisstyle="STAR", duration=4);
+  filter: progid:DXImageTransform.Microsoft.Wave(strength=100) progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1) progid:DXImageTransform.Microsoft.Iris(irisstyle='STAR', duration=4);
   filter: progid:DXImageTransform.Microsoft.MotionBlur(strength=13, direction=310) progid:DXImageTransform.Microsoft.Blur(pixelradius=2) progid:DXImageTransform.Microsoft.Wheel(duration=3);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled="false", startColorstr=#550000FF, endColorstr=#55FFFF00);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled='false', startColorstr=#550000FF, endColorstr=#55FFFF00);
 }
 
 <===> warning
diff --git a/spec/non_conformant/scss/interpolation-operators-precedence.hrx b/spec/non_conformant/scss/interpolation-operators-precedence.hrx
index 32d0f14046..859cc4be14 100644
--- a/spec/non_conformant/scss/interpolation-operators-precedence.hrx
+++ b/spec/non_conformant/scss/interpolation-operators-precedence.hrx
@@ -54,12 +54,12 @@
 }
 
 <===> error
-Error: Undefined operation: "a times 5%".
-
-<===> error-dart-sass
 Error: Undefined operation "a * 5%".
    ,
 13 |   c04: (#{a} *5.0% + 2);
    |         ^^^^^^^^^^
    '
   input.scss 13:9  root stylesheet
+
+<===> error-libsass
+Error: Undefined operation: "a times 5%".
diff --git a/spec/non_conformant/scss/nested-extend.hrx b/spec/non_conformant/scss/nested-extend.hrx
index 0ac61c115d..3110150c62 100644
--- a/spec/non_conformant/scss/nested-extend.hrx
+++ b/spec/non_conformant/scss/nested-extend.hrx
@@ -22,11 +22,11 @@
 }
 
 <===> output.css
-.sprites-nav, .mw_nav_button[data-ur-state="disabled"] {
+.sprites-nav, .mw_nav_button[data-ur-state=disabled] {
   color: red;
 }
 
-.sprites-nav_up, .mw_nav_button[data-ur-state="enabled"] {
+.sprites-nav_up, .mw_nav_button[data-ur-state=enabled] {
   color: green;
 }
 
@@ -38,12 +38,12 @@
   overflow: hidden;
 }
 
-<===> output-dart-sass.css
-.sprites-nav, .mw_nav_button[data-ur-state=disabled] {
+<===> output-libsass.css
+.sprites-nav, .mw_nav_button[data-ur-state="disabled"] {
   color: red;
 }
 
-.sprites-nav_up, .mw_nav_button[data-ur-state=enabled] {
+.sprites-nav_up, .mw_nav_button[data-ur-state="enabled"] {
   color: green;
 }
 
diff --git a/spec/non_conformant/scss/while_without_condition.hrx b/spec/non_conformant/scss/while_without_condition.hrx
index 724720e640..53bf566a49 100644
--- a/spec/non_conformant/scss/while_without_condition.hrx
+++ b/spec/non_conformant/scss/while_without_condition.hrx
@@ -4,14 +4,14 @@
 }
 
 <===> error
-Error: Invalid CSS after "@while ": expected expression (e.g. 1px, bold), was "{"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Expected expression.
   ,
 1 | @while {
   |        ^
   '
   input.scss 1:8  root stylesheet
+
+<===> error-libsass
+Error: Invalid CSS after "@while ": expected expression (e.g. 1px, bold), was "{"
+        on line 1 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/values/maps/duplicate-keys.hrx b/spec/values/maps/duplicate-keys.hrx
index 6b5f4e3606..4b5a806012 100644
--- a/spec/values/maps/duplicate-keys.hrx
+++ b/spec/values/maps/duplicate-keys.hrx
@@ -10,11 +10,6 @@ $map: (
 );
 
 <===> error
-Error: Duplicate key "eta" in map (eta: 5, eta: 6).
-        on line 5 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: Duplicate key.
   ,
 6 |     eta: 5,
@@ -23,3 +18,8 @@ Error: Duplicate key.
   |     ^^^ second key
   '
   input.scss 7:5  root stylesheet
+
+<===> error-libsass
+Error: Duplicate key "eta" in map (eta: 5, eta: 6).
+        on line 5 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/values/maps/errors.hrx b/spec/values/maps/errors.hrx
index f330adc176..3e4b16b074 100644
--- a/spec/values/maps/errors.hrx
+++ b/spec/values/maps/errors.hrx
@@ -3,14 +3,14 @@ $map: ( foo: bar );
 test { baz: $map; }
 
 <===> error
-Error: (foo: bar) isn't a valid CSS value.
-        on line 2 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: (foo: bar) isn't a valid CSS value.
   ,
 2 | test { baz: $map; }
   |             ^^^^
   '
   input.scss 2:13  root stylesheet
+
+<===> error-libsass
+Error: (foo: bar) isn't a valid CSS value.
+        on line 2 of input.scss
+  Use --trace for backtrace.
diff --git a/spec/values/maps/invalid-key.hrx b/spec/values/maps/invalid-key.hrx
index 1ba36d3e04..6ed4c525a3 100644
--- a/spec/values/maps/invalid-key.hrx
+++ b/spec/values/maps/invalid-key.hrx
@@ -2,11 +2,6 @@
 $id: inspect((a,b:c)...)
 
 <===> error
-Error: Invalid CSS after "$id: inspect((a,b": expected ")", was ":c)...)"
-        on line 1 of input.scss
-  Use --trace for backtrace.
-
-<===> error-dart-sass
 Error: expected ")".
   ,
 1 | $id: inspect((a,b:c)...)