diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb
index 2020bee4..6084055c 100644
--- a/app/controllers/works_controller.rb
+++ b/app/controllers/works_controller.rb
@@ -50,7 +50,7 @@ def update
       flash.now[:status] = :failure
       flash.now[:result_text] = "Could not update #{@media_category.singularize}"
       flash.now[:messages] = @work.errors.messages
-      render :edit, status: :not_found
+      render :edit, status: :bad_request
     end
   end
 
diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb
index 0945ca47..7746eaac 100644
--- a/test/controllers/works_controller_test.rb
+++ b/test/controllers/works_controller_test.rb
@@ -3,16 +3,29 @@
 describe WorksController do
   describe "root" do
     it "succeeds with all media types" do
+
+      get root_path
+      must_respond_with :success
       # Precondition: there is at least one media of each category
 
     end
 
     it "succeeds with one media type absent" do
+      work = Work.find_by(category: 'movie')
+      work.destroy
+
+      get root_path
+      must_respond_with :success
       # Precondition: there is at least one media in two of the categories
 
     end
 
     it "succeeds with no media" do
+      works.each do |work|
+        work.destroy
+      end
+      get root_path
+      must_respond_with :success
 
     end
   end
@@ -22,76 +35,192 @@
 
   describe "index" do
     it "succeeds when there are works" do
-
+      get works_path
+      must_respond_with :success
     end
 
     it "succeeds when there are no works" do
-
+      works.each do |work|
+        work.destroy
+      end
+      get works_path
+      must_respond_with :success
     end
   end
 
   describe "new" do
-    it "succeeds" do
 
+    it "succeeds" do
+      get new_work_path
+      must_respond_with :success
     end
   end
 
   describe "create" do
+    let (:work_hash) do
+          {
+            work: {
+              title: 'Harry Potter',
+              creator: 'JK Rowling',
+              description: 'magical',
+              publication_year: 2012,
+              category: 'book'
+            }
+          }
+        end
+
     it "creates a work with valid data for a real category" do
+      expect {
+              post works_path, params: work_hash
+            }.must_change 'Work.count', 1
+
+            must_respond_with :redirect
+            must_redirect_to work_path(Work.last.id)
 
+            expect(Work.last.title).must_equal work_hash[:work][:title]
+            expect(Work.last.creator).must_equal work_hash[:work][:creator]
+            expect(Work.last.description).must_equal work_hash[:work][:description]
+            expect(Work.last.publication_year).must_equal work_hash[:work][:publication_year]
+            expect(Work.last.category).must_equal work_hash[:work][:category]
     end
 
     it "renders bad_request and does not update the DB for bogus data" do
+      work_hash[:work][:title] = nil
+
+      # Act-Assert
+      expect {
+        post works_path, params: work_hash
+      }.wont_change 'Work.count'
+
+      must_respond_with :bad_request
 
     end
 
     it "renders 400 bad_request for bogus categories" do
+      work_hash[:work][:category] = 'pizza'
+
+      # Act-Assert
+      expect {
+        post works_path, params: work_hash
+      }.wont_change 'Work.count'
 
+      must_respond_with :bad_request
     end
 
   end
 
   describe "show" do
     it "succeeds for an extant work ID" do
-
+      id = works(:poodr).id
+      get work_path(id)
+      must_respond_with :success
     end
 
     it "renders 404 not_found for a bogus work ID" do
-
+      id = -1
+      get work_path(id)
+      must_respond_with :not_found
     end
   end
 
   describe "edit" do
     it "succeeds for an extant work ID" do
-
+      id = works(:poodr).id
+      get edit_work_path(id)
+      must_respond_with :success
     end
 
     it "renders 404 not_found for a bogus work ID" do
-
+      id = -1
+      get edit_work_path(id)
+      expect(response).must_be :not_found?
+      must_respond_with :not_found
     end
   end
 
   describe "update" do
+    let (:work_hash) do
+          {
+            work: {
+              title: 'Harry Potter',
+              creator: 'JK Rowling',
+              description: 'magical',
+              publication_year: 2012,
+              category: 'book'
+            }
+          }
+        end
     it "succeeds for valid data and an extant work ID" do
+      id = works(:poodr).id
+
+      expect {
+        patch work_path(id), params: work_hash
+      }.wont_change 'Work.count'
+
+      must_respond_with :redirect
+      must_redirect_to work_path(id)
 
+      new_work = Work.find_by(id: id)
+
+      expect(new_work.title).must_equal work_hash[:work][:title]
+      expect(new_work.creator).must_equal work_hash[:work][:creator]
+      expect(new_work.description).must_equal work_hash[:work][:description]
+      expect(new_work.publication_year).must_equal work_hash[:work][:publication_year]
+      expect(new_work.category).must_equal work_hash[:work][:category]
     end
 
     it "renders bad_request for bogus data" do
+      work_hash[:work][:title] = nil
+        id = works(:poodr).id
+        old_poodr = works(:poodr)
+
+
+        expect {
+          patch work_path(id), params: work_hash
+        }.wont_change 'Work.count'
+        new_poodr = Work.find(id)
 
+        must_respond_with :bad_request
+        expect(old_poodr.title).must_equal new_poodr.title
+        expect(old_poodr.creator).must_equal new_poodr.creator
+        expect(old_poodr.description).must_equal new_poodr.description
+        expect(old_poodr.publication_year).must_equal new_poodr.publication_year
+        expect(old_poodr.category).must_equal new_poodr.category
     end
 
     it "renders 404 not_found for a bogus work ID" do
+      id = -1
 
+            expect {
+              patch work_path(id), params: work_hash
+            }.wont_change 'Work.count'
+
+            must_respond_with :not_found
     end
   end
 
   describe "destroy" do
     it "succeeds for an extant work ID" do
+      id = works(:poodr).id
+      title = works(:poodr).title
+
+      # Act - Assert
+      expect {
+        delete work_path(id)
+      }.must_change 'Work.count', -1
 
+      must_respond_with :redirect
+      must_redirect_to root_path
+      expect(Work.find_by(id: id)).must_equal nil
     end
 
     it "renders 404 not_found and does not update the DB for a bogus work ID" do
+      id = -1
+      expect {
+        delete work_path(id)
+      }.wont_change 'Work.count'
 
+      must_respond_with :not_found
     end
   end