diff --git a/deployment/keystone/changeset/helpers_test.go b/deployment/keystone/changeset/helpers_test.go
index d956db991de..f51a4ed610c 100644
--- a/deployment/keystone/changeset/helpers_test.go
+++ b/deployment/keystone/changeset/helpers_test.go
@@ -41,7 +41,7 @@ func TestSetupTestEnv(t *testing.T) {
 			NumChains:       3,
 			UseMCMS:         useMCMS,
 		})
-		t.Run(fmt.Sprintf("set up test env using MCMS: %T", useMCMS), func(t *testing.T) {
+		t.Run(fmt.Sprintf("set up test env using MCMS: %t", useMCMS), func(t *testing.T) {
 			require.NotNil(t, te.Env.ExistingAddresses)
 			require.Len(t, te.Env.Chains, 3)
 			require.NotEmpty(t, te.RegistrySelector)
diff --git a/deployment/keystone/changeset/update_don_test.go b/deployment/keystone/changeset/update_don_test.go
index 64cb41c14e5..012111c4e62 100644
--- a/deployment/keystone/changeset/update_don_test.go
+++ b/deployment/keystone/changeset/update_don_test.go
@@ -104,18 +104,10 @@ func TestUpdateDon(t *testing.T) {
 		csOut, err := changeset.UpdateDon(te.Env, &cfg)
 		require.NoError(t, err)
 
-		if true {
-			require.Len(t, csOut.Proposals, 1)
-			require.Len(t, csOut.Proposals[0].Transactions, 1)          // append node capabilties cs, update don
-			require.Len(t, csOut.Proposals[0].Transactions[0].Batch, 3) // add capabilities, update nodes, update don
-			require.Nil(t, csOut.AddressBook)
-		} else {
-			require.Len(t, csOut.Proposals, 1)
-			require.Len(t, csOut.Proposals[0].Transactions, 2)          // append node capabilties cs, update don
-			require.Len(t, csOut.Proposals[0].Transactions[0].Batch, 2) // add capabilities, update nodes
-			require.Len(t, csOut.Proposals[0].Transactions[1].Batch, 1) // update don
-			require.Nil(t, csOut.AddressBook)
-		}
+		require.Len(t, csOut.Proposals, 1)
+		require.Len(t, csOut.Proposals[0].Transactions, 1)          // append node capabilties cs, update don
+		require.Len(t, csOut.Proposals[0].Transactions[0].Batch, 3) // add capabilities, update nodes, update don
+		require.Nil(t, csOut.AddressBook)
 
 		// now apply the changeset such that the proposal is signed and execed
 		contracts := te.ContractSets()[te.RegistrySelector]
diff --git a/deployment/keystone/ocr3config.go b/deployment/keystone/ocr3config.go
index aed142ea116..d80c4930df4 100644
--- a/deployment/keystone/ocr3config.go
+++ b/deployment/keystone/ocr3config.go
@@ -328,7 +328,7 @@ func configureOCR3contract(req configureOCR3Request) (*configureOCR3Response, er
 	)
 	if err != nil {
 		err = DecodeErr(kocr3.OCR3CapabilityABI, err)
-		return nil, fmt.Errorf("failed to call SetConfig for OCR3 contract %s using mcms: %T: %w", req.contract.Address().String(), req.useMCMS, err)
+		return nil, fmt.Errorf("failed to call SetConfig for OCR3 contract %s using mcms: %t: %w", req.contract.Address().String(), req.useMCMS, err)
 	}
 
 	var ops *timelock.BatchChainOperation