diff --git a/app/controllers/api/v01/bibs_controller.rb b/app/controllers/api/v01/bibs_controller.rb
index 6d467186..4134f8e7 100644
--- a/app/controllers/api/v01/bibs_controller.rb
+++ b/app/controllers/api/v01/bibs_controller.rb
@@ -31,7 +31,7 @@ def create_or_update_teacher_sets
           message = e.message
           response = SYS_FAILURE.call(e.code, e.message, e.detailed_msg, "Bib id: #{req_body["id"]}")
         rescue SuppressedBibRecordException, BibRecordNotFoundException => e
-          http_status = 500 #this is for testing
+          http_status = 404
           message = e.message
           response = SYS_FAILURE.call(e.code, e.message, e.detailed_msg, "Bib id: #{req_body["id"]}")
         rescue DBException, ElasticsearchException => e
@@ -81,7 +81,7 @@ def delete_teacher_sets
           message = e.message
           response = SYS_FAILURE.call(e.code, message, e.detailed_msg, "Bib id: #{req_body["id"]}")
         rescue BibRecordNotFoundException => e
-          http_status = 500 #this is for testing
+          http_status = 404
           message = e.message
           response = SYS_FAILURE.call(e.code, message, e.detailed_msg, "Bib id: #{req_body["id"]}")
         rescue DBException, ElasticsearchException => e
diff --git a/app/controllers/api/v01/items_controller.rb b/app/controllers/api/v01/items_controller.rb
index ed21990a..30f65542 100644
--- a/app/controllers/api/v01/items_controller.rb
+++ b/app/controllers/api/v01/items_controller.rb
@@ -46,7 +46,7 @@ def update_availability
 
           teacher_set = TeacherSet.find_by_bnumber("b#{t_set_bnumber}")
           unless teacher_set.present?
-            http_status = 500 #this is for testing
+            http_status = 404
             message = "BIB id not found in MLN DB. Bib id b#{t_set_bnumber},"
             http_response = SYS_FAILURE.call(http_status, message, "Item id: #{req_body["id"]}")
           end
diff --git a/test/functional/api/v01/items_controller_test.rb b/test/functional/api/v01/items_controller_test.rb
index 297090c4..dc58418f 100644
--- a/test/functional/api/v01/items_controller_test.rb
+++ b/test/functional/api/v01/items_controller_test.rb
@@ -34,17 +34,17 @@ def setup
     end
   end
 
-  # test "Bib id is empty" do
-  #   @controller.stub :parse_request_body, req_body_for_item do
-  #     @valid_teacher_set.stub :update_available_and_total_count, true do
-  #       post :update_availability, params: { items: @request_body }
+  test "Bib id is empty" do
+    @controller.stub :parse_request_body, req_body_for_item do
+      @valid_teacher_set.stub :update_available_and_total_count, true do
+        post :update_availability, params: { items: @request_body }
 
-  #       assert_response :success
-  #       response_body = JSON.parse(@response.body)
-  #       assert_equal 404, response_body["items"][0]["status"]
-  #     end
-  #   end
-  # end
+        assert_response :success
+        response_body = JSON.parse(@response.body)
+        assert_equal 404, response_body["items"][0]["status"]
+      end
+    end
+  end
 
   test "NYPL source is empty" do
     @request_body = [{