diff --git a/lib/fog/aws/models/s3/bucket.rb b/lib/fog/aws/models/s3/bucket.rb
index 244f17614..63fe19664 100644
--- a/lib/fog/aws/models/s3/bucket.rb
+++ b/lib/fog/aws/models/s3/bucket.rb
@@ -19,6 +19,7 @@ module Fog
 
         def delete
           connection.delete_bucket(name)
+          true
         end
 
         def location
@@ -49,6 +50,7 @@ module Fog
             options['LocationConstraint'] = @location
           end
           connection.put_bucket(name, options)
+          true
         end
 
       end
diff --git a/lib/fog/aws/models/s3/object.rb b/lib/fog/aws/models/s3/object.rb
index 8895300fa..a2f0ab5f6 100644
--- a/lib/fog/aws/models/s3/object.rb
+++ b/lib/fog/aws/models/s3/object.rb
@@ -27,6 +27,10 @@ module Fog
           super
         end
 
+        def bucket
+          @bucket
+        end
+
         def copy(target_bucket_name, target_object_key)
           data = connection.copy_object(bucket.name, key, target_bucket_name, target_object_key).body
           copy = self.dup
@@ -42,11 +46,13 @@ module Fog
 
         def delete
           connection.delete_object(bucket, key)
+          true
         end
 
         def save(options = {})
           data = connection.put_object(bucket.name, key, body, options)
           @etag = data.headers['ETag']
+          true
         end
 
         private
@@ -55,10 +61,6 @@ module Fog
           @bucket = new_bucket
         end
 
-        def bucket
-          @bucket
-        end
-
       end
 
     end
diff --git a/lib/fog/aws/models/s3/objects.rb b/lib/fog/aws/models/s3/objects.rb
index 39f5df02d..d48207cda 100644
--- a/lib/fog/aws/models/s3/objects.rb
+++ b/lib/fog/aws/models/s3/objects.rb
@@ -42,6 +42,10 @@ module Fog
           objects
         end
 
+        def bucket
+          @bucket
+        end
+
         def create(attributes = {})
           object = new(attributes)
           object.save
@@ -89,10 +93,6 @@ module Fog
           @bucket = new_bucket
         end
 
-        def bucket
-          @bucket
-        end
-
       end
 
     end
diff --git a/spec/aws/models/s3/bucket_spec.rb b/spec/aws/models/s3/bucket_spec.rb
new file mode 100644
index 000000000..b0ab032ae
--- /dev/null
+++ b/spec/aws/models/s3/bucket_spec.rb
@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'S3::Bucket' do
+
+  describe "#initialize" do
+
+    it "should return an S3::Bucket"
+
+  end
+
+  describe "#delete" do
+
+    it "should return the success value"
+
+  end
+
+  describe "#location" do
+
+    it "should return the location constraint"
+
+  end
+
+  describe "#objects" do
+
+    it "should return an S3::Objects"
+
+  end
+
+  describe "#payer" do
+
+    it "should return the request payment value"
+
+  end
+
+  describe "#payer=" do
+
+    it "should set the request payment value"
+
+  end
+
+  describe "#save" do
+
+    it "should return the success value"
+
+  end
+
+end
diff --git a/spec/aws/models/s3/buckets_spec.rb b/spec/aws/models/s3/buckets_spec.rb
index 037a5c955..dfbaffc16 100644
--- a/spec/aws/models/s3/buckets_spec.rb
+++ b/spec/aws/models/s3/buckets_spec.rb
@@ -1,28 +1,23 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.buckets' do
+describe 'S3::Buckets' do
+
+  describe "#all" do
+
+    it "should return an S3::Buckets"
 
-  it "should return buckets from all" do
-    p s3.buckets.all
   end
 
-  it "should create bucket" do
-    p @bucket = s3.buckets.create(:name => 'fogbucketstest')
-    p @bucket.delete
+  describe "#create" do
+
+    it "should return an S3::Bucket that has been persisted to s3"
+
   end
 
-  it "should get/put request payment" do
-    p @bucket = s3.buckets.create(:name => 'fogbucketspaymenttest')
-    p @bucket.payer = 'BucketOwner'
-    p @bucket.payer
-    p @bucket.delete
+  describe "#new" do
+
+    it "should return an S3::Bucket"
+
   end
 
-  it "should push bucket down into objects" do
-    p @bucket = s3.buckets.create(:name => 'fogbucketsobjectstest')
-    p @bucket.objects.new(:key => 'object')
-    p @bucket.objects.all
-    p @bucket.delete
-  end
-
-end
\ No newline at end of file
+end
diff --git a/spec/aws/models/s3/object_spec.rb b/spec/aws/models/s3/object_spec.rb
new file mode 100644
index 000000000..f9d9646b2
--- /dev/null
+++ b/spec/aws/models/s3/object_spec.rb
@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'S3::Object' do
+
+  describe "#initialize" do
+
+    it "should return an S3::Object"
+
+  end
+
+  describe "#bucket" do
+
+    it "should return an S3::Bucket"
+
+  end
+
+  describe "#copy" do
+
+    it "should return an S3::Object"
+
+  end
+
+  describe "#delete" do
+
+    it "should return the success value"
+
+  end
+
+  describe "#location" do
+
+    it "should return the location constraint"
+
+  end
+
+  describe "#save" do
+
+    it "should return the success value"
+
+  end
+
+end
diff --git a/spec/aws/models/s3/objects_spec.rb b/spec/aws/models/s3/objects_spec.rb
new file mode 100644
index 000000000..aec591e55
--- /dev/null
+++ b/spec/aws/models/s3/objects_spec.rb
@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'S3::Objects' do
+
+  describe "#initialize" do
+
+    it "should return an S3::Objects"
+
+  end
+
+  describe "#all" do
+
+    it "should return an S3::Objects"
+
+  end
+
+  describe "#bucket" do
+
+    it "should return an S3::Bucket"
+
+  end
+
+  describe "#create" do
+
+    it "should return an S3::Object that has been persisted to s3"
+
+  end
+
+  describe "#get" do
+
+    it "should return an S3::Object with metadata and data"
+
+  end
+
+  describe "#head" do
+
+    it "should return an S3::Object with metadata"
+
+  end
+
+  describe "#new" do
+
+    it "should return an S3::Object"
+
+  end
+
+end
diff --git a/spec/aws/models/s3/owner_spec.rb b/spec/aws/models/s3/owner_spec.rb
new file mode 100644
index 000000000..ecb4552a7
--- /dev/null
+++ b/spec/aws/models/s3/owner_spec.rb
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'S3::Owner' do
+
+  describe "#initialize" do
+
+    it "should return an S3::Owner"
+
+  end
+
+end