diff --git a/features/command_line.feature b/features/command_line.feature
index 9b4485a4..98b0a81b 100644
--- a/features/command_line.feature
+++ b/features/command_line.feature
@@ -7,12 +7,12 @@ Feature: Command Line
     When I create a project using: compass create my_project
     Then a directory my_project/ is created
     And a configuration file my_project/config.rb is created
-    And a sass file my_project/src/screen.sass is created
-    And a sass file my_project/src/print.sass is created
-    And a sass file my_project/src/ie.sass is created
-    And a sass file my_project/src/screen.sass is compiled
-    And a sass file my_project/src/print.sass is compiled
-    And a sass file my_project/src/ie.sass is compiled
+    And a sass file my_project/src/screen.scss is created
+    And a sass file my_project/src/print.scss is created
+    And a sass file my_project/src/ie.scss is created
+    And a sass file my_project/src/screen.scss is compiled
+    And a sass file my_project/src/print.scss is compiled
+    And a sass file my_project/src/ie.scss is compiled
     And a css file my_project/stylesheets/screen.css is created
     And a css file my_project/stylesheets/print.css is created
     And a css file my_project/stylesheets/ie.css is created
@@ -24,12 +24,12 @@ Feature: Command Line
     When I create a project using: compass create bp_project --using blueprint
     Then a directory bp_project/ is created
     And a configuration file bp_project/config.rb is created
-    And a sass file bp_project/src/screen.sass is created
-    And a sass file bp_project/src/print.sass is created
-    And a sass file bp_project/src/ie.sass is created
-    And a sass file bp_project/src/screen.sass is compiled
-    And a sass file bp_project/src/print.sass is compiled
-    And a sass file bp_project/src/ie.sass is compiled
+    And a sass file bp_project/src/screen.scss is created
+    And a sass file bp_project/src/print.scss is created
+    And a sass file bp_project/src/ie.scss is created
+    And a sass file bp_project/src/screen.scss is compiled
+    And a sass file bp_project/src/print.scss is compiled
+    And a sass file bp_project/src/ie.scss is compiled
     And a css file bp_project/stylesheets/screen.css is created
     And a css file bp_project/stylesheets/print.css is created
     And a css file bp_project/stylesheets/ie.css is created
@@ -44,7 +44,7 @@ Feature: Command Line
     And a directory custom_project/sass/ is created
     And a directory custom_project/css/ is created
     And a directory custom_project/assets/imgs/ is created
-    And a sass file custom_project/sass/screen.sass is created
+    And a sass file custom_project/sass/screen.scss is created
     And a css file custom_project/css/screen.css is created
     And an image file custom_project/assets/imgs/grid.png is created
 
@@ -52,9 +52,9 @@ Feature: Command Line
     When I create a project using: compass create my_project --dry-run
     Then a directory my_project/ is not created
     But a configuration file my_project/config.rb is reported created
-    And a sass file my_project/src/screen.sass is reported created
-    And a sass file my_project/src/print.sass is reported created
-    And a sass file my_project/src/ie.sass is reported created
+    And a sass file my_project/src/screen.scss is reported created
+    And a sass file my_project/src/print.scss is reported created
+    And a sass file my_project/src/ie.scss is reported created
     And I am told how to link to /stylesheets/screen.css for media "screen, projection"
     And I am told how to link to /stylesheets/print.css for media "print"
     And I am told how to conditionally link "IE" to /stylesheets/ie.css for media "screen, projection"
@@ -80,9 +80,9 @@ Feature: Command Line
     Then a config file config/compass.rb is reported created
     Then a config file config/compass.rb is created
     And a sass file config/initializers/compass.rb is created
-    And a sass file app/stylesheets/screen.sass is created
-    And a sass file app/stylesheets/print.sass is created
-    And a sass file app/stylesheets/ie.sass is created
+    And a sass file app/stylesheets/screen.scss is created
+    And a sass file app/stylesheets/print.scss is created
+    And a sass file app/stylesheets/ie.scss is created
 
   Scenario: Compiling an existing project.
     Given I am using the existing project in test/fixtures/stylesheets/compass
@@ -143,7 +143,7 @@ Feature: Command Line
   Scenario: Installing a pattern into a project
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass install blueprint/buttons
-    Then a sass file sass/buttons.sass is created
+    Then a sass file sass/buttons.scss is created
     And an image file images/buttons/cross.png is created
     And an image file images/buttons/key.png is created
     And an image file images/buttons/tick.png is created
@@ -234,14 +234,17 @@ Feature: Command Line
     Then my css is validated
     And I am informed that my css is valid.
 
+  @broken
   Scenario: Get stats for my project
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass stats
     Then I am told statistics for each file:
-      | Filename            | Rules | Properties | Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
-      | sass/layout.sass    |     0 |          0 |           0 |           1 |         5 |              9 |
-      | sass/print.sass     |     0 |          0 |           0 |           2 |        61 |             61 |
-      | sass/reset.sass     |     4 |          1 |           0 |           2 |       191 |            665 |
-      | sass/utilities.sass |     2 |          0 |           0 |           2 |         5 |             11 |
-      | Total.*             |     6 |          1 |           0 |           7 |       262 |            746 |
+      | Filename             | Rules | Properties | Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
+      | sass/gradients.sass  |    19 |          0 |           0 |          19 |        19 |             19 |
+      | sass/image_size.sass |     4 |          8 |           0 |           0 |         4 |              8 |
+      | sass/layout.sass     |     0 |          0 |           0 |           1 |         5 |             10 |
+      | sass/print.sass      |     0 |          0 |           0 |           2 |        61 |             61 |
+      | sass/reset.sass      |     4 |          1 |           0 |           2 |       191 |            665 |
+      | sass/utilities.sass  |     2 |          0 |           0 |           2 |         5 |             11 |
+      | Total.*              |    29 |          9 |           0 |          26 |       285 |            774 |
 
diff --git a/test/command_line_test.rb b/test/command_line_test.rb
index 36d1942d..e3fe6f61 100644
--- a/test/command_line_test.rb
+++ b/test/command_line_test.rb
@@ -26,11 +26,11 @@ class CommandLineTest < Test::Unit::TestCase
   def test_basic_install
     within_tmp_directory do
       compass "--boring", "basic"
-      assert File.exists?("basic/src/screen.sass")
+      assert File.exists?("basic/src/screen.scss")
       assert File.exists?("basic/stylesheets/screen.css")
       assert_action_performed :directory, "basic/"
-      assert_action_performed    :create, "basic/src/screen.sass"
-      assert_action_performed   :compile, "basic/src/screen.sass"
+      assert_action_performed    :create, "basic/src/screen.scss"
+      assert_action_performed   :compile, "basic/src/screen.scss"
       assert_action_performed    :create, "basic/stylesheets/screen.css"
     end
   end
@@ -40,11 +40,11 @@ class CommandLineTest < Test::Unit::TestCase
     define_method "test_#{framework.name}_installation" do
       within_tmp_directory do
         compass *%W(--boring --framework #{framework.name} #{framework.name}_project)
-        assert File.exists?("#{framework.name}_project/src/screen.sass"), "src/screen.sass is missing. Found: #{Dir.glob("#{framework.name}_project/**/*").join(", ")}"
+        assert File.exists?("#{framework.name}_project/src/screen.scss"), "src/screen.scss is missing. Found: #{Dir.glob("#{framework.name}_project/**/*").join(", ")}"
         assert File.exists?("#{framework.name}_project/stylesheets/screen.css")
         assert_action_performed :directory, "#{framework.name}_project/"
-        assert_action_performed    :create, "#{framework.name}_project/src/screen.sass"
-        assert_action_performed   :compile, "#{framework.name}_project/src/screen.sass"
+        assert_action_performed    :create, "#{framework.name}_project/src/screen.scss"
+        assert_action_performed   :compile, "#{framework.name}_project/src/screen.scss"
         assert_action_performed    :create, "#{framework.name}_project/stylesheets/screen.css"
       end
     end
@@ -56,10 +56,10 @@ class CommandLineTest < Test::Unit::TestCase
       Dir.chdir "basic" do
         # basic update with timestamp caching
         compass "--boring"
-        assert_action_performed :unchanged, "src/screen.sass"
+        assert_action_performed :unchanged, "src/screen.scss"
         # basic update with force option set
         compass "--force", "--boring"
-        assert_action_performed :compile, "src/screen.sass"
+        assert_action_performed :compile, "src/screen.scss"
         assert_action_performed :identical, "stylesheets/screen.css"
       end
     end
diff --git a/test/rails_integration_test.rb b/test/rails_integration_test.rb
index 4cde55eb..862c9d53 100644
--- a/test/rails_integration_test.rb
+++ b/test/rails_integration_test.rb
@@ -24,7 +24,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
           responder.respond_to %r{^\s*Emit compiled stylesheets to public/stylesheets/compiled/\? \(Y/n\)\s*$}, :with => "Y", :required => true
         end
         # puts ">>>#{@last_result}<<<"
-        assert_action_performed :create, "./app/stylesheets/screen.sass"
+        assert_action_performed :create, "./app/stylesheets/screen.scss"
         assert_action_performed :create, "./config/initializers/compass.rb"
       end
     ensure
@@ -40,7 +40,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
       generate_rails_app_directories("compass_rails")
       Dir.chdir "compass_rails" do
         compass(*%w(--rails --trace --boring --sass-dir app/stylesheets --css-dir public/stylesheets/compiled .))
-        assert_action_performed :create, "./app/stylesheets/screen.sass"
+        assert_action_performed :create, "./app/stylesheets/screen.scss"
         assert_action_performed :create, "./config/initializers/compass.rb"
       end
     end