diff --git a/htlcswitch/switch_control_test.go b/htlcswitch/control_tower_test.go
similarity index 97%
rename from htlcswitch/switch_control_test.go
rename to htlcswitch/control_tower_test.go
index 021ef1da..cf0258dd 100644
--- a/htlcswitch/switch_control_test.go
+++ b/htlcswitch/control_tower_test.go
@@ -79,7 +79,7 @@ func TestPaymentControlSwitchFail(t *testing.T) {
 		t.Fatalf("unable to send htlc message: %v", err)
 	}
 
-	pStatus, err := db.FetchPaymentStatus(htlc.PaymentHash)
+	pStatus, err = db.FetchPaymentStatus(htlc.PaymentHash)
 	if err != nil {
 		t.Fatalf("unable to fetch payment status: %v", err)
 	}
@@ -106,7 +106,7 @@ func TestPaymentControlSwitchFail(t *testing.T) {
 
 	// Attempt a final payment, which should now fail since the prior
 	// payment succeed.
-	if err := pControl.ClearForTakeoff(htlc); err != nil {
+	if err := pControl.ClearForTakeoff(htlc); err != ErrAlreadyPaid {
 		t.Fatalf("unable to send htlc message: %v", err)
 	}
 }