diff --git a/lib/restfulie/server/action_controller/created_responder.rb b/lib/restfulie/server/action_controller/created_responder.rb
index 84e576d0..5141d531 100644
--- a/lib/restfulie/server/action_controller/created_responder.rb
+++ b/lib/restfulie/server/action_controller/created_responder.rb
@@ -6,7 +6,7 @@ module ActionController
       module CreatedResponder
 
         def to_format
-          if [201, :created].include? options[:status]
+          if (options[:status] == 201) || (options[:status] == :created)
             head :status => 201, :location => controller.url_for(resource)
           else
             super
diff --git a/spec/restfulie/server/action_controller/created_responder_spec.rb b/spec/restfulie/server/action_controller/created_responder_spec.rb
new file mode 100644
index 00000000..ccb44a2a
--- /dev/null
+++ b/spec/restfulie/server/action_controller/created_responder_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Type do
+  
+end
diff --git a/tests/spec/controllers/albums_controller_spec.rb b/tests/spec/controllers/integration/albums_controller_spec.rb
similarity index 96%
rename from tests/spec/controllers/albums_controller_spec.rb
rename to tests/spec/controllers/integration/albums_controller_spec.rb
index 1688a415..686b0ad3 100644
--- a/tests/spec/controllers/albums_controller_spec.rb
+++ b/tests/spec/controllers/integration/albums_controller_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe AlbumsController do
   
diff --git a/tests/spec/controllers/cacheable_clients_controller_spec.rb b/tests/spec/controllers/integration/cacheable_clients_controller_spec.rb
similarity index 95%
rename from tests/spec/controllers/cacheable_clients_controller_spec.rb
rename to tests/spec/controllers/integration/cacheable_clients_controller_spec.rb
index 43ab5984..d04a942d 100644
--- a/tests/spec/controllers/cacheable_clients_controller_spec.rb
+++ b/tests/spec/controllers/integration/cacheable_clients_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe CacheableClientsController do
   before(:each) do
diff --git a/spec/units/server/action_controller/created_responder_spec.rb b/tests/spec/controllers/integration/created_responder_spec.rb
similarity index 60%
rename from spec/units/server/action_controller/created_responder_spec.rb
rename to tests/spec/controllers/integration/created_responder_spec.rb
index ee04e3b6..4939c136 100644
--- a/spec/units/server/action_controller/created_responder_spec.rb
+++ b/tests/spec/controllers/integration/created_responder_spec.rb
@@ -15,24 +15,20 @@ def create
 
 end
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
-end
-
-describe CreationController, :type => :controller do
-  
-  before(:each) do
-    request.accept = "application/atom+xml"
-  end
+describe CreationController do
   
   context "creating a resource" do
     
     it "should return 201 with location" do
+      request.accept = "application/atom+xml"
+      
       uri = "http://newlocation.com/uri"
-      controller.should_receive(:url_for).and_return uri
+      
+      controller.stub(:url_for).and_return uri
+
       post :create
-      controller.response.code.should == "201"
-      controller.response.headers["Location"].should == uri
+      response.code.should == "201"
+      response.headers["Location"].should == uri
     end
 
   end      
diff --git a/tests/spec/controllers/projects_controller_spec.rb b/tests/spec/controllers/integration/projects_controller_spec.rb
similarity index 92%
rename from tests/spec/controllers/projects_controller_spec.rb
rename to tests/spec/controllers/integration/projects_controller_spec.rb
index 73801580..8950e95a 100644
--- a/tests/spec/controllers/projects_controller_spec.rb
+++ b/tests/spec/controllers/integration/projects_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe ProjectsController do
 
diff --git a/tests/spec/controllers/songs_controller_spec.rb b/tests/spec/controllers/songs_controller_spec.rb
deleted file mode 100644
index 3d35e31c..00000000
--- a/tests/spec/controllers/songs_controller_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'spec_helper'
-
-describe SongsController do
-
-
-end