diff --git a/gems/fizzy-saas/test/controllers/signups/completions_controller_test.rb b/gems/fizzy-saas/test/controllers/signups/completions_controller_test.rb
index 89c67ca64..0c049da6c 100644
--- a/gems/fizzy-saas/test/controllers/signups/completions_controller_test.rb
+++ b/gems/fizzy-saas/test/controllers/signups/completions_controller_test.rb
@@ -18,25 +18,22 @@ class Signup::CompletionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create" do
-    skip("TODO:PLANB: hard to make work without account_id on models and Current.membership being sorted for the setup_customer_template notification generation")
     untenanted do
       post saas.signup_completion_path, params: {
         signup: {
-          membership_id: @signup.membership_id,
           full_name: @signup.full_name,
-          account_name: @signup.account_name
         }
       }
     end
 
-    assert_redirected_to landing_path(script_name: "/#{@signup.tenant}"), "Successful completion should redirect to root in new tenant"
+    assert_response :redirect, "Valid params should redirect"
+  end
 
+  test "create with invalid params" do
     untenanted do
       post saas.signup_completion_path, params: {
         signup: {
-          membership_id: @membership_id,
           full_name: "",
-          account_name: ""
         }
       }
     end
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
index 180b7ff34..876863dd8 100644
--- a/test/models/card_test.rb
+++ b/test/models/card_test.rb
@@ -75,13 +75,6 @@ class CardTest < ActiveSupport::TestCase
     assert_equal "prioritized", cards(:logo).taggings.last.tag.title
   end
 
-  test "searchable by title" do
-    card = boards(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin)
-
-    skip("TODO:PLANB: search")
-    assert_includes Card.search("haggis"), card
-  end
-
   test "closed" do
     assert_equal [ cards(:shipping) ], Card.closed
   end
@@ -112,15 +105,6 @@ class CardTest < ActiveSupport::TestCase
     assert_equal cards(:layout, :text), Card.tagged_with(tags(:mobile))
   end
 
-  test "mentioning" do
-    card = boards(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin)
-    cards(:logo).comments.create!(body: "I hate haggis")
-    cards(:text).comments.create!(body: "I love haggis")
-
-    skip("TODO:PLANB: search")
-    assert_equal [ card, cards(:logo), cards(:text) ].sort, Card.mentioning("haggis").sort
-  end
-
   test "for published cards, it should set the default title 'Untitiled' when not provided" do
     card = boards(:writebook).cards.create!
     assert_nil card.title
diff --git a/test/models/comment_test.rb b/test/models/comment_test.rb
index 20c3f6000..c519f8fbd 100644
--- a/test/models/comment_test.rb
+++ b/test/models/comment_test.rb
@@ -4,11 +4,4 @@ class CommentTest < ActiveSupport::TestCase
   setup do
     Current.session = sessions(:david)
   end
-
-  test "searchable by body" do
-    comment = cards(:logo).comments.create!(body: "I'd prefer something more rustic")
-
-    skip("TODO:PLANB: search")
-    assert_includes Comment.search("something rustic"), comment
-  end
 end
diff --git a/test/models/user/searcher_test.rb b/test/models/user/searcher_test.rb
index 784f1ae50..35a95cd48 100644
--- a/test/models/user/searcher_test.rb
+++ b/test/models/user/searcher_test.rb
@@ -13,11 +13,6 @@ class User::SearcherTest < ActiveSupport::TestCase
     assert_equal "broken", @user.search_queries.last.terms
   end
 
-  test "return an empty functional relation when no query" do
-    skip("TODO:PLANB: search")
-    assert Card.where(id: @user.search("").select(:card_id)).none?
-  end
-
   test "don't duplicate repeated searches but touch the existing match" do
     search_result = @user.remember_search("broken")
     original_updated_at = search_result.updated_at