diff --git a/spec/arguments/invocation.hrx b/spec/arguments/invocation.hrx
index c6838cf95..01a9cca1a 100644
--- a/spec/arguments/invocation.hrx
+++ b/spec/arguments/invocation.hrx
@@ -58,7 +58,7 @@ Error: Positional arguments must come before keyword arguments.
 
 <===>
 ================================================================================
-<===> function/error/multi-line-arguments/declaration/input.sass
+<===> function/error/sass/multi-line-arguments/declaration/input.sass
 @function a(
   $b, 
   $c
@@ -68,7 +68,7 @@ Error: Positional arguments must come before keyword arguments.
 e
   f: a(g, h)
 
-<===> function/error/multi-line-arguments/declaration/error
+<===> function/error/sass/multi-line-arguments/declaration/error
 Error: expected ")".
   ,
 1 | @function a(
@@ -78,7 +78,7 @@ Error: expected ")".
 
 <===>
 ================================================================================
-<===> function/error/multi-line-arguments/invocation/input.sass
+<===> function/error/sass/multi-line-arguments/invocation/input.sass
 @function a($b, $c)
   @return d
 
@@ -88,7 +88,7 @@ e
     h
   )
 
-<===> function/error/multi-line-arguments/invocation/error
+<===> function/error/sass/multi-line-arguments/invocation/error
 Error: expected ")".
   ,
 5 |   f: a(
@@ -98,14 +98,14 @@ Error: expected ")".
 
 <===>
 ================================================================================
-<===> function/arguments/input.sass
+<===> function/arguments/sass/input.sass
 @function a($b, $c)
   @return d
 
 e
   f: a(g, h)
 
-<===> function/arguments/output.css
+<===> function/arguments/sass/output.css
 e {
   f: d;
 }
diff --git a/spec/css/custom_properties/trailing_whitespace.hrx b/spec/css/custom_properties/trailing_whitespace.hrx
index 6ae51f11c..b57fb36ce 100644
--- a/spec/css/custom_properties/trailing_whitespace.hrx
+++ b/spec/css/custom_properties/trailing_whitespace.hrx
@@ -1,34 +1,101 @@
-<===> scss/input.scss
-.trailing-whitespace {
-  --space: value ;
-  --tab: value	;
-  --newline: value
+<===> scss/space/input.scss
+a {
+  --b: c ;
+}
+
+<===> scss/space/output.css
+a {
+  --b: c ;
+}
+
+<===>
+================================================================================
+<===> scss/tab/input.scss
+a {
+  --b: c	;
+}
+
+<===> scss/tab/output.css
+a {
+  --b: c	;
+}
+
+<===>
+================================================================================
+<===> scss/newline/input.scss
+a {
+  --b: c
 ;
-  --before-closing-brace: value
 }
 
-<===> scss/output.css
-.trailing-whitespace {
-  --space: value ;
-  --tab: value	;
-  --newline: value ;
-  --before-closing-brace: value ;
+<===> scss/newline/output.css
+a {
+  --b: c ;
+}
+
+<===>
+================================================================================
+<===> scss/before-closing-brace/input.scss
+a {
+  --b: c
+}
+
+<===> scss/before-closing-brace/output.css
+a {
+  --b: c ;
 }
 
 <===>
 ================================================================================
-<===> sass/input.sass
-.trailing-whitespace
-  --space: value 
-  --tab: value	
-  --newline: value
-
-  --before-closing-brace: value
-
-<===> sass/output.css
-.trailing-whitespace {
-  --space: value;
-  --tab: value;
-  --newline: value;
-  --before-closing-brace: value;
+<===> sass/space/input.sass
+a
+  --b: c 
+
+<===> sass/space/output.css
+a {
+  --b: c;
+}
+
+<===>
+================================================================================
+<===> sass/tab/input.sass
+a
+  --b: c	
+
+<===> sass/tab/output.css
+a {
+  --b: c;
+}
+
+<===>
+================================================================================
+<===> sass/newline/input.sass
+a
+  --b: c
+
+  --d: e
+
+
+<===> sass/newline/output.css
+a {
+  --b: c;
+  --d: e;
+}
+
+<===>
+================================================================================
+<===> sass/before-block-end/input.sass
+a
+  --b: c
+
+d
+  --e: f
+
+<===> sass/before-block-end/output.css
+a {
+  --b: c;
+}
+
+d {
+  --e: f;
 }
diff --git a/spec/css/custom_properties/value_interpolation.hrx b/spec/css/custom_properties/value_interpolation.hrx
index 00643b5af..69dd6d306 100644
--- a/spec/css/custom_properties/value_interpolation.hrx
+++ b/spec/css/custom_properties/value_interpolation.hrx
@@ -18,45 +18,139 @@
   --in-uri: uri(foo3bar);
 }
 
+<===>
+================================================================================
+<===> scss/alone/input.scss
+a{
+  --b: #{1 + 2};
+}
+
+<===> scss/alone/output.css
+a {
+  --b: 3;
+}
+
+<===>
+================================================================================
+<===> scss/in-list/input.scss
+a{
+  --b: c #{1 + 2} d;
+}
+
+<===> scss/in-list/output.css
+a {
+  --b: c 3 d;
+}
+
+<===>
+================================================================================
+<===> scss/in-string/input.scss
+a{
+  --b: "c#{1 + 2}d";
+}
+
+<===> scss/in-string/output.css
+a {
+  --b: "c3d";
+}
+
+<===>
+================================================================================
+<===> scss/in-ident/input.scss
+a{
+  --b: c#{1 + 2}d;
+}
+
+<===> scss/in-ident/output.css
+a {
+  --b: c3d;
+}
+
+<===>
+================================================================================
+<===> scss/in-uri/input.scss
+a{
+  --b: uri(c#{1 + 2}d);
+}
+
+<===> scss/in-uri/output.css
+a {
+  --b: uri(c3d);
+}
+
 <===>
 ================================================================================
 <===> scss/linebreak-interpolation/input.scss
-.a{
+a{
   --b: #{1 
     + 
     2};
 }
 
 <===> scss/linebreak-interpolation/output.css
-.a {
+a {
   --b: 3;
 }
 
 <===>
 ================================================================================
-<===> sass/input.sass
-.value-interpolation
-  --alone: #{1 + 2}
-  --in-list: a #{1 + 2} c
-  --in-ident: foo#{1 + 2}bar
-  --in-string: "foo#{1 + 2}bar"
-  --in-uri: uri(foo#{1 + 2}bar)
+<===> sass/alone/input.sass
+a
+  --b: #{1 + 2}
 
-<===> sass/linebreak-interpolation/output.css
+<===> sass/alone/output.css
+a {
+  --b: 3;
+}
 
-<===> sass/output.css
-.value-interpolation {
-  --alone: 3;
-  --in-list: a 3 c;
-  --in-ident: foo3bar;
-  --in-string: "foo3bar";
-  --in-uri: uri(foo3bar);
+<===>
+================================================================================
+<===> sass/in-list/input.sass
+a
+  --b: c #{1 + 2} d
+
+<===> sass/in-list/output.css
+a {
+  --b: c 3 d;
+}
+
+<===>
+================================================================================
+<===> sass/in-string/input.sass
+a
+  --b: "c#{1 + 2}d"
+
+<===> sass/in-string/output.css
+a {
+  --b: "c3d";
+}
+
+<===>
+================================================================================
+<===> sass/in-ident/input.sass
+a
+  --b: c#{1 + 2}d
+
+<===> sass/in-ident/output.css
+a {
+  --b: c3d;
+}
+
+<===>
+================================================================================
+<===> sass/in-uri/input.sass
+a
+  --b: uri(c#{1 + 2}d)
+
+<===> sass/in-uri/output.css
+a {
+  --b: uri(c3d);
 }
 
 <===>
 ================================================================================
 <===> error/sass/linebreak-interpolation/input.sass
-.a
+a
   --b: #{1 
     + 
     2}
diff --git a/spec/directives/each.hrx b/spec/directives/each.hrx
index 6bc002756..e03457f53 100644
--- a/spec/directives/each.hrx
+++ b/spec/directives/each.hrx
@@ -1,10 +1,10 @@
-<===> inline/input.sass
+<===> sass/inline/input.sass
 
 @each $a in b, c
   .#{$a}
     d: $a
 
-<===> inline/output.css
+<===> sass/inline/output.css
 .b {
   d: b;
 }
@@ -15,14 +15,14 @@
 
 <===>
 ================================================================================
-<===> error/multiline/after-each/input.sass
+<===> error/sass/multiline/after-each/input.sass
 
 @each
   $a in b, c
   .#{$a}
     d: $a
 
-<===> error/multiline/after-each/error
+<===> error/sass/multiline/after-each/error
 Error: expected "$".
   ,
 2 | @each
@@ -32,14 +32,14 @@ Error: expected "$".
 
 <===>
 ================================================================================
-<===> error/multiline/after-variable/input.sass
+<===> error/sass/multiline/after-variable/input.sass
 
 @each $a 
   in b, c
   .#{$a}
     d: $a
 
-<===> error/multiline/after-variable/error
+<===> error/sass/multiline/after-variable/error
 Error: Expected "in".
   ,
 2 | @each $a 
@@ -49,14 +49,14 @@ Error: Expected "in".
 
 <===>
 ================================================================================
-<===> error/multiline/after-in/input.sass
+<===> error/sass/multiline/after-in/input.sass
 
 @each $a in
   b, c
   .#{$a}
     d: $a
 
-<===> error/multiline/after-in/error
+<===> error/sass/multiline/after-in/error
 Error: Expected expression.
   ,
 2 | @each $a in
@@ -66,28 +66,28 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> error/multiline/in-expression/input.sass
+<===> error/sass/multiline/in-expression/input.sass
 
 @each $a in b,
  c
   .#{$a}
     d: $a
 
-<===> error/multiline/in-expression/output.css
+<===> error/sass/multiline/in-expression/output.css
 c .b {
   d: b;
 }
 
 <===>
 ================================================================================
-<===> error/multiline/in-wrapped-expression/input.sass
+<===> error/sass/multiline/in-wrapped-expression/input.sass
 
 @each $a in (b,
  c)
   .#{$a}
     d: $a
 
-<===> error/multiline/in-wrapped-expression/error
+<===> error/sass/multiline/in-wrapped-expression/error
 Error: expected ")".
   ,
 2 | @each $a in (b,
diff --git a/spec/directives/for/comment.hrx b/spec/directives/for/comment.hrx
index 0e4e6db83..ffd32bdcc 100644
--- a/spec/directives/for/comment.hrx
+++ b/spec/directives/for/comment.hrx
@@ -5,11 +5,11 @@
 
 <===>
 ================================================================================
-<===> before_var/loud/indented/input.sass
+<===> before_var/loud/sass/input.sass
 @for /**/ $i from 1 through 10
 
 
-<===> before_var/loud/indented/output.css
+<===> before_var/loud/sass/output.css
 
 <===>
 ================================================================================
@@ -21,11 +21,11 @@
 
 <===>
 ================================================================================
-<===> error/before_var/silent/indented/input.sass
+<===> error/before_var/silent/sass/input.sass
 @for //
   $i from 1 through 10
 
-<===> error/before_var/silent/indented/error
+<===> error/before_var/silent/sass/error
 Error: expected "$".
   ,
 1 | @for //
@@ -35,11 +35,11 @@ Error: expected "$".
 
 <===>
 ================================================================================
-<===> error/before_from/silent/indented/input.sass
+<===> error/before_from/silent/sass/input.sass
 @for $i //
   from 1 through 10
 
-<===> error/before_from/silent/indented/error
+<===> error/before_from/silent/sass/error
 Error: Expected "from".
   ,
 1 | @for $i //
@@ -49,12 +49,12 @@ Error: Expected "from".
 
 <===>
 ================================================================================
-<===> error/after_from/silent/indented/input.sass
+<===> error/after_from/silent/sass/input.sass
 @for $i from //
   1 through 10
 
 
-<===> error/after_from/silent/indented/error
+<===> error/after_from/silent/sass/error
 Error: Expected expression.
   ,
 1 | @for $i from //
@@ -64,12 +64,12 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> error/before_through/silent/indented/input.sass
+<===> error/before_through/silent/sass/input.sass
 @for $i from 1 //
   through 10
 
 
-<===> error/before_through/silent/indented/error
+<===> error/before_through/silent/sass/error
 Error: Expected "to" or "through".
   ,
 1 | @for $i from 1 //
@@ -79,12 +79,12 @@ Error: Expected "to" or "through".
 
 <===>
 ================================================================================
-<===> error/after_through/silent/indented/input.sass
+<===> error/after_through/silent/sass/input.sass
 @for $i from 1 through //
   10
 
 
-<===> error/after_through/silent/indented/error
+<===> error/after_through/silent/sass/error
 Error: Expected expression.
   ,
 1 | @for $i from 1 through //
@@ -101,11 +101,11 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> before_from/loud/indented/input.sass
+<===> before_from/loud/sass/input.sass
 @for $i /**/ from 1 through 10
 
 
-<===> before_from/loud/indented/output.css
+<===> before_from/loud/sass/output.css
 
 <===>
 ================================================================================
@@ -124,11 +124,11 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> after_from/loud/indented/input.sass
+<===> after_from/loud/sass/input.sass
 @for $i from /**/ 1 through 10
 
 
-<===> after_from/loud/indented/output.css
+<===> after_from/loud/sass/output.css
 
 <===>
 ================================================================================
@@ -147,11 +147,11 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> before_through/loud/indented/input.sass
+<===> before_through/loud/sass/input.sass
 @for $i from 1 /**/ through 10
 
 
-<===> before_through/loud/indented/output.css
+<===> before_through/loud/sass/output.css
 
 <===>
 ================================================================================
@@ -170,10 +170,10 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> after_through/loud/indented/input.sass
+<===> after_through/loud/sass/input.sass
 @for $i from 1 through /**/ 10
 
-<===> after_through/loud/indented/output.css
+<===> after_through/loud/sass/output.css
 
 <===>
 ================================================================================
@@ -192,11 +192,11 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> before_block/loud/indented/input.sass
+<===> before_block/loud/sass/input.sass
 @for $i from 1 through 10 /**/
 
 
-<===> before_block/loud/indented/output.css
+<===> before_block/loud/sass/output.css
 
 <===>
 ================================================================================
@@ -208,8 +208,8 @@ Error: Expected expression.
 
 <===>
 ================================================================================
-<===> before_block/silent/indented/input.sass
+<===> before_block/silent/sass/input.sass
 @for $i from 1 through 10 //
   
 
-<===> before_block/silent/indented/output.css
+<===> before_block/silent/sass/output.css
diff --git a/spec/directives/if/indented.hrx b/spec/directives/if/indented.hrx
index 516c31385..981688c20 100644
--- a/spec/directives/if/indented.hrx
+++ b/spec/directives/if/indented.hrx
@@ -1,38 +1,38 @@
-<===> if/input.sass
+<===> sass/if/input.sass
 $b: true
 a
   @if $b
     value: 1
 
-<===> if/if-statement-unwrapped-multiline/output.css
+<===> sass/if/if-statement-unwrapped-multiline/output.css
 
-<===> if/output.css
+<===> sass/if/output.css
 a {
   value: 1;
 }
 
 <===>
 ================================================================================
-<===> if-statement/input.sass
+<===> sass/if-statement/input.sass
 $b: c
 a
   @if $b == c
     value: 1
 
-<===> if-statement/output.css
+<===> sass/if-statement/output.css
 a {
   value: 1;
 }
 
 <===>
 ================================================================================
-<===> if-statement-wrapped/input.sass
+<===> sass/if-statement-wrapped/input.sass
 $b: c
 a
   @if ($b == c)
     d: e
 
-<===> if-statement-wrapped/output.css
+<===> sass/if-statement-wrapped/output.css
 a {
   d: e;
 }