diff --git a/Guardfile b/Guardfile
index 8dd4a029..a0fe2bbb 100644
--- a/Guardfile
+++ b/Guardfile
@@ -29,12 +29,8 @@ guard :minitest, spring: true, all_on_start: false do
   watch('app/controllers/account_activations_controller.rb') do
     'test/integration/users_signup_test.rb'
   end
-  watch('app/models/micropost.rb') do
-    ['test/models/micropost_test.rb', 'test/models/user_test.rb']
-  end
   watch(%r{app/views/users/*}) do
-    resource_tests('users') +
-    ['test/integration/microposts_interface_test.rb']
+    resource_tests('users')
   end
 end
 
@@ -55,4 +51,4 @@ end
 # Returns all tests for the given resource.
 def resource_tests(resource)
   integration_tests(resource) << controller_test(resource)
-end
\ No newline at end of file
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6b8f2a57..e76d4eb5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,18 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141111014949) do
-
-  create_table "microposts", force: :cascade do |t|
-    t.text     "content"
-    t.integer  "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string   "picture"
-  end
-
-  add_index "microposts", ["user_id", "created_at"], name: "index_microposts_on_user_id_and_created_at"
-  add_index "microposts", ["user_id"], name: "index_microposts_on_user_id"
+ActiveRecord::Schema.define(version: 20141107180258) do
 
   create_table "users", force: :cascade do |t|
     t.string   "name"