diff --git a/test/fixtures/stylesheets/blueprint/sass/ie.sass b/test/fixtures/stylesheets/blueprint/sass/ie.sass
index cbd72ab5..d6550a70 100644
--- a/test/fixtures/stylesheets/blueprint/sass/ie.sass
+++ b/test/fixtures/stylesheets/blueprint/sass/ie.sass
@@ -1,3 +1,3 @@
 @import blueprint/ie
 
-+blueprint-ie
\ No newline at end of file
++blueprint-ie
diff --git a/test/fixtures/stylesheets/blueprint/sass/print.sass b/test/fixtures/stylesheets/blueprint/sass/print.sass
index 493af468..a73f37fa 100644
--- a/test/fixtures/stylesheets/blueprint/sass/print.sass
+++ b/test/fixtures/stylesheets/blueprint/sass/print.sass
@@ -1,3 +1,3 @@
 @import blueprint/print
 
-+blueprint-print
\ No newline at end of file
++blueprint-print
diff --git a/test/fixtures/stylesheets/blueprint/sass/screen.sass b/test/fixtures/stylesheets/blueprint/sass/screen.sass
index 02878257..96006ee4 100644
--- a/test/fixtures/stylesheets/blueprint/sass/screen.sass
+++ b/test/fixtures/stylesheets/blueprint/sass/screen.sass
@@ -2,6 +2,7 @@
 @import compass/reset
 
 +blueprint
+
 #main.container
   #top
     +column(24, true)
diff --git a/test/fixtures/stylesheets/compass/sass/gradients.sass b/test/fixtures/stylesheets/compass/sass/gradients.sass
index 24188102..3690c481 100644
--- a/test/fixtures/stylesheets/compass/sass/gradients.sass
+++ b/test/fixtures/stylesheets/compass/sass/gradients.sass
@@ -1,51 +1,68 @@
 @import compass/css3
 
 .linear-1
-  +linear-gradient(color_stops(#ddd, #aaa))
+  +linear-gradient(color_stops(#dddddd, #aaaaaa))
+
 .linear-2
-  +linear-gradient(color_stops(#ddd, #aaa), "left")
+  +linear-gradient(color_stops(#dddddd, #aaaaaa), left)
+
 .linear-3
-  +linear-gradient(color_stops(#ddd, #aaa), "top left")
+  +linear-gradient(color_stops(#dddddd, #aaaaaa), unquote("top left"))
+
 .linear-4
-  +linear-gradient(color_stops(#ddd, #aaa), "top right")
+  +linear-gradient(color_stops(#dddddd, #aaaaaa), unquote("top right"))
+
 .linear-5
-  +linear-gradient(color_stops(#ddd, #ccc, #aaa))
+  +linear-gradient(color_stops(#dddddd, #cccccc, #aaaaaa))
+
 .linear-6
-  +linear-gradient(color_stops(#ddd, #ccc 20%, #aaa))
+  +linear-gradient(color_stops(#dddddd, #cccccc 20%, #aaaaaa))
+
 .linear-7
-  +linear-gradient(color_stops(#ddd, #ccc 20%, #eee, #aaa))
+  +linear-gradient(color_stops(#dddddd, #cccccc 20%, #eeeeee, #aaaaaa))
+
 .linear-8
-  +linear-gradient(color_stops(#ddd 80%, #aaa))
+  +linear-gradient(color_stops(#dddddd 80%, #aaaaaa))
+
 .linear-9
-  +linear-gradient(color_stops(#ddd, #aaa 20%))
+  +linear-gradient(color_stops(#dddddd, #aaaaaa 20%))
+
 .linear-10
-  +linear-gradient(color_stops(#ddd 40%, #aaa 50%))
+  +linear-gradient(color_stops(#dddddd 40%, #aaaaaa 50%))
+
 .linear-11
-  +linear-gradient(color_stops(#ddd 40%, #000, #aaa 50%))
+  +linear-gradient(color_stops(#dddddd 40%, black, #aaaaaa 50%))
+
 .radial-1
   // A default radial gradient:
-  // A centered gradient having the shape of the container (aka ellipse)
-  +radial-gradient(color_stops(#ddd, #aaa))
+     A centered gradient having the shape of the container (aka ellipse)
+  +radial-gradient(color_stops(#dddddd, #aaaaaa))
+
 .radial-2
   // A centered gradient having the shape of the container (aka ellipse)
-  +radial-gradient(color_stops(#ddd, #aaa))
+  +radial-gradient(color_stops(#dddddd, #aaaaaa))
+
 .radial-3
   // A centered gradient at the top having the shape of the container (aka ellipse)
-  +radial-gradient(color_stops(#ddd, #aaa), "top center")
+  +radial-gradient(color_stops(#dddddd, #aaaaaa), unquote("top center"))
+
 .radial-4
   // A centered gradient having a circular shape
-  +radial-gradient(color_stops(#ddd, #aaa))
+  +radial-gradient(color_stops(#dddddd, #aaaaaa))
+
 .radial-5
   // A centered gradient at the top having a circular shape
-  +radial-gradient(color_stops(#ddd, #aaa), "top center")
+  +radial-gradient(color_stops(#dddddd, #aaaaaa), unquote("top center"))
+
 .radial-6
   // A centered circular gradient with color stops
-  // The color stops must be absolute units
-  +radial-gradient(color_stops(#ddd 20px, #aaa 50px))
+     The color stops must be absolute units
+  +radial-gradient(color_stops(#dddddd 20px, #aaaaaa 50px))
+
 .radial-7
   // A centered elliptical gradient with color stops
-  // The color stops must be relative units
-  +radial-gradient(color_stops(#ddd 20%, #aaa 50px))
+     The color stops must be relative units
+  +radial-gradient(color_stops(#dddddd 20%, #aaaaaa 50px))
 
 .alpha-linear
   +linear-gradient(color_stops(rgba(255, 255, 255, 0) 40%, rgba(255, 127, 127, 0.5), rgba(255, 255, 255, 1) 50%))
diff --git a/test/fixtures/stylesheets/compass/sass/image_size.sass b/test/fixtures/stylesheets/compass/sass/image_size.sass
index 982fceee..a129b7ec 100644
--- a/test/fixtures/stylesheets/compass/sass/image_size.sass
+++ b/test/fixtures/stylesheets/compass/sass/image_size.sass
@@ -1,12 +1,15 @@
 .png
-  width= image_width("100x150.png")
-  height= image_height("100x150.png")
+  width: image_width(unquote("100x150.png"))
+  height: image_height(unquote("100x150.png"))
+
 .jpg
-  width= image_width("100x150.jpg")
-  height= image_height("100x150.jpg")
+  width: image_width(unquote("100x150.jpg"))
+  height: image_height(unquote("100x150.jpg"))
+
 .jpeg
-  width= image_width("100x150.jpeg")
-  height= image_height("100x150.jpeg")
+  width: image_width(unquote("100x150.jpeg"))
+  height: image_height(unquote("100x150.jpeg"))
+
 .gif
-  width= image_width("100x150.gif")
-  height= image_height("100x150.gif")
+  width: image_width(unquote("100x150.gif"))
+  height: image_height(unquote("100x150.gif"))
diff --git a/test/fixtures/stylesheets/compass/sass/layout.sass b/test/fixtures/stylesheets/compass/sass/layout.sass
index e557a24b..0e8736f8 100644
--- a/test/fixtures/stylesheets/compass/sass/layout.sass
+++ b/test/fixtures/stylesheets/compass/sass/layout.sass
@@ -1,3 +1,3 @@
 @import compass/layout
 
-+sticky-footer(72px, "#layout", "#layout_footer", "#footer")
++sticky-footer(72px, unquote("#layout"), unquote("#layout_footer"), unquote("#footer"))
diff --git a/test/fixtures/stylesheets/compass/sass/print.sass b/test/fixtures/stylesheets/compass/sass/print.sass
index bd466fe4..43ddeb8f 100644
--- a/test/fixtures/stylesheets/compass/sass/print.sass
+++ b/test/fixtures/stylesheets/compass/sass/print.sass
@@ -2,4 +2,4 @@
 
 +print-utilities
 
-+print-utilities("screen")
++print-utilities(screen)
diff --git a/test/fixtures/stylesheets/compass/sass/reset.sass b/test/fixtures/stylesheets/compass/sass/reset.sass
index 54b5f50f..625d8da0 100644
--- a/test/fixtures/stylesheets/compass/sass/reset.sass
+++ b/test/fixtures/stylesheets/compass/sass/reset.sass
@@ -2,9 +2,11 @@
 
 // Turn off the display for both of these classes
 .unregistered-only, .registered-only
-  :display none
+  display: none
+
 // Now turn only one of them back on depending on some other context.
 body.registered
-  +reset-display(".registered-only")
+  +reset-display(unquote(".registered-only"))
+
 body.unregistered
-  +reset-display(".unregistered-only")
+  +reset-display(unquote(".unregistered-only"))
diff --git a/test/fixtures/stylesheets/compass/sass/utilities.sass b/test/fixtures/stylesheets/compass/sass/utilities.sass
index 1f834cc3..57b62e8d 100644
--- a/test/fixtures/stylesheets/compass/sass/utilities.sass
+++ b/test/fixtures/stylesheets/compass/sass/utilities.sass
@@ -2,5 +2,6 @@
 
 .clearfix
   +clearfix
+
 .pie-clearfix
   +pie-clearfix
diff --git a/test/fixtures/stylesheets/image_urls/sass/screen.sass b/test/fixtures/stylesheets/image_urls/sass/screen.sass
index 75c55c4b..7649b1a6 100644
--- a/test/fixtures/stylesheets/image_urls/sass/screen.sass
+++ b/test/fixtures/stylesheets/image_urls/sass/screen.sass
@@ -1,6 +1,5 @@
 .showgrid
-  background-image= image_url("grid.png")
+  background-image: image_url(unquote("grid.png"))
 
 .inlinegrid
-  background-image= inline_image("grid.png")
-  
+  background-image: inline_image(unquote("grid.png"))
diff --git a/test/fixtures/stylesheets/relative/sass/ie.sass b/test/fixtures/stylesheets/relative/sass/ie.sass
index b38d08b4..0db02041 100644
--- a/test/fixtures/stylesheets/relative/sass/ie.sass
+++ b/test/fixtures/stylesheets/relative/sass/ie.sass
@@ -1,6 +1,5 @@
-/*
-  Welcome to Compass. Use this file to write IE specific override styles.
-  Import this file using the following HTML or equivalent:
-  <!--[if IE]>
-    <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
-  <![endif]-->
+/* Welcome to Compass. Use this file to write IE specific override styles.
+   Import this file using the following HTML or equivalent:
+   <!--[if IE]>
+     <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
+   <![endif]-->
diff --git a/test/fixtures/stylesheets/relative/sass/print.sass b/test/fixtures/stylesheets/relative/sass/print.sass
index 34991cab..a4a85270 100644
--- a/test/fixtures/stylesheets/relative/sass/print.sass
+++ b/test/fixtures/stylesheets/relative/sass/print.sass
@@ -1,6 +1,3 @@
-/*
-  Welcome to Compass. Use this file to define print styles.
-  Import this file using the following HTML or equivalent:
-  <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" />
-  
-
+/* Welcome to Compass. Use this file to define print styles.
+   Import this file using the following HTML or equivalent:
+   <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" />
diff --git a/test/fixtures/stylesheets/relative/sass/screen.sass b/test/fixtures/stylesheets/relative/sass/screen.sass
index cba1ea72..07757c5d 100644
--- a/test/fixtures/stylesheets/relative/sass/screen.sass
+++ b/test/fixtures/stylesheets/relative/sass/screen.sass
@@ -1,3 +1,2 @@
-
 test
-  background= image_url("testing.png")
+  background: image_url(unquote("testing.png"))