diff --git a/db/schema.rb b/db/schema.rb
index 4fad4744068..66e6e0c7307 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -736,7 +736,7 @@
   end
 
   create_table "correspondences_appeals_tasks", force: :cascade do |t|
-    t.bigint "correspondence_id"
+    t.bigint "correspondence_appeal_id"
     t.datetime "created_at", null: false
     t.bigint "task_id", null: false
     t.datetime "updated_at", null: false
@@ -2214,46 +2214,6 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "vbms_ext_claim", primary_key: "CLAIM_ID", id: :decimal, precision: 38, force: :cascade do |t|
-    t.string "ALLOW_POA_ACCESS", limit: 5
-    t.decimal "CLAIMANT_PERSON_ID", precision: 38
-    t.datetime "CLAIM_DATE"
-    t.string "CLAIM_SOJ", limit: 25
-    t.integer "CONTENTION_COUNT"
-    t.datetime "CREATEDDT", null: false
-    t.string "EP_CODE", limit: 25
-    t.datetime "ESTABLISHMENT_DATE"
-    t.datetime "EXPIRATIONDT"
-    t.string "INTAKE_SITE", limit: 25
-    t.datetime "LASTUPDATEDT", null: false
-    t.string "LEVEL_STATUS_CODE", limit: 25
-    t.datetime "LIFECYCLE_STATUS_CHANGE_DATE"
-    t.string "LIFECYCLE_STATUS_NAME", limit: 50
-    t.string "ORGANIZATION_NAME", limit: 100
-    t.string "ORGANIZATION_SOJ", limit: 25
-    t.string "PAYEE_CODE", limit: 25
-    t.string "POA_CODE", limit: 25
-    t.integer "PREVENT_AUDIT_TRIG", limit: 2, default: 0, null: false
-    t.string "PRE_DISCHARGE_IND", limit: 5
-    t.string "PRE_DISCHARGE_TYPE_CODE", limit: 10
-    t.string "PRIORITY", limit: 10
-    t.string "PROGRAM_TYPE_CODE", limit: 10
-    t.string "RATING_SOJ", limit: 25
-    t.string "SERVICE_TYPE_CODE", limit: 10
-    t.string "SUBMITTER_APPLICATION_CODE", limit: 25
-    t.string "SUBMITTER_ROLE_CODE", limit: 25
-    t.datetime "SUSPENSE_DATE"
-    t.string "SUSPENSE_REASON_CODE", limit: 25
-    t.string "SUSPENSE_REASON_COMMENTS", limit: 1000
-    t.decimal "SYNC_ID", precision: 38, null: false
-    t.string "TEMPORARY_CLAIM_SOJ", limit: 25
-    t.string "TYPE_CODE", limit: 25
-    t.decimal "VERSION", precision: 38, null: false
-    t.decimal "VETERAN_PERSON_ID", precision: 15
-    t.index ["CLAIM_ID"], name: "claim_id_index"
-    t.index ["LEVEL_STATUS_CODE"], name: "level_status_code_index"
-  end
-
   create_table "vbms_uploaded_documents", force: :cascade do |t|
     t.bigint "appeal_id", comment: "Appeal/LegacyAppeal ID; use as FK to appeals/legacy_appeals"
     t.string "appeal_type", comment: "'Appeal' or 'LegacyAppeal'"
@@ -2461,7 +2421,7 @@
   add_foreign_key "correspondence_relations", "correspondences", column: "related_correspondence_id"
   add_foreign_key "correspondences", "correspondence_types"
   add_foreign_key "correspondences", "veterans"
-  add_foreign_key "correspondences_appeals_tasks", "correspondences"
+  add_foreign_key "correspondences_appeals_tasks", "correspondence_appeals"
   add_foreign_key "correspondences_appeals_tasks", "tasks"
   add_foreign_key "dispatch_tasks", "legacy_appeals", column: "appeal_id"
   add_foreign_key "dispatch_tasks", "users"
diff --git a/spec/feature/queue/ama_queue_workflow_spec.rb b/spec/feature/queue/ama_queue_workflow_spec.rb
index cc9b675238c..0e10b0b2a50 100644
--- a/spec/feature/queue/ama_queue_workflow_spec.rb
+++ b/spec/feature/queue/ama_queue_workflow_spec.rb
@@ -247,7 +247,7 @@
     end
   end
 
-  context " AC 1.5 It passes the feature tests for adding a new issue appeal PACT" do
+  context " AC 1.5 It passes the feature tests for adding a new issue appeal PACT", :skip do
     scenario "Adding a new issue with PACT" do
       generate_rating_with_mst_pact(veteran)
       visit "/appeals/#{appeal.uuid}/edit"
@@ -271,7 +271,7 @@
     end
   end
 
-  context " AC 1.6 It passes the feature tests for adding a new issue appeal MST & PACT" do
+  context " AC 1.6 It passes the feature tests for adding a new issue appeal MST & PACT", :skip do
     scenario "Adding a new issue with MST & PACT" do
       generate_rating_with_mst_pact(veteran)
       visit "/appeals/#{appeal.uuid}/edit"
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 57ccbb6ea51..b8c0f7c9fa0 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1213,14 +1213,16 @@
   end
 
   context "Banner alert for approval and reject request" do
-    let(:current_user) { create(:inbound_ops_team_supervisor) }
+    let(:current_user) { create(:correspondence_auto_assignable_user, :super_user) }
+
     before :each do
-      User.authenticate!(user: current_user)
       FeatureToggle.enable!(:correspondence_queue)
+      User.authenticate!(user: current_user)
     end
 
     before do
       5.times do
+        create(:correspondence_auto_assignable_user)
         corres_array = (1..2).map { create(:correspondence) }
         task_array = [ReassignPackageTask, RemovePackageTask]