diff --git a/finality-provider/service/app_test.go b/finality-provider/service/app_test.go
index f5f4f393..4d024084 100644
--- a/finality-provider/service/app_test.go
+++ b/finality-provider/service/app_test.go
@@ -222,7 +222,7 @@ func FuzzUnjailFinalityProvider(f *testing.F) {
 		mockConsumerController.EXPECT().QueryLastPublicRandCommit(gomock.Any()).Return(nil, nil).AnyTimes()
 		mockConsumerController.EXPECT().QueryLatestFinalizedBlock().Return(nil, nil).AnyTimes()
 		mockConsumerController.EXPECT().QueryLatestBlockHeight().Return(currentHeight, nil).AnyTimes()
-		mockConsumerController.EXPECT().QueryBlock(gomock.Any()).Return(nil, errors.New("chain not online")).AnyTimes()
+		mockConsumerController.EXPECT().QueryBlocks(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("chain not online")).AnyTimes()
 
 		// set voting power to be positive so that the fp should eventually become ACTIVE
 		mockConsumerController.EXPECT().QueryFinalityProviderHasPower(gomock.Any(), gomock.Any()).Return(false, nil).AnyTimes()
@@ -231,13 +231,11 @@ func FuzzUnjailFinalityProvider(f *testing.F) {
 		mockConsumerController.EXPECT().QueryFinalityProviderSlashedOrJailed(gomock.Any()).Return(false, true, nil).AnyTimes()
 		mockConsumerController.EXPECT().QueryFinalityProviderHighestVotedHeight(gomock.Any()).Return(uint64(0), nil).AnyTimes()
 
-		expectedTxHash := testutil.GenRandomHexStr(r, 32)
-
 		// Create fp app
 		app, fpPk, cleanup := startFPAppWithRegisteredFp(t, r, fpHomeDir, &fpCfg, mockBabylonController, mockConsumerController)
 		defer cleanup()
 
-		expectedTxHash = datagen.GenRandomHexStr(r, 32)
+		expectedTxHash := datagen.GenRandomHexStr(r, 32)
 		mockConsumerController.EXPECT().UnjailFinalityProvider(fpPk.MustToBTCPK()).Return(&types.TxResponse{TxHash: expectedTxHash}, nil).AnyTimes()
 		err := app.StartFinalityProvider(fpPk, "")
 		require.NoError(t, err)
diff --git a/finality-provider/service/chain_poller.go b/finality-provider/service/chain_poller.go
index b0e3b24a..0e1b5121 100644
--- a/finality-provider/service/chain_poller.go
+++ b/finality-provider/service/chain_poller.go
@@ -145,6 +145,7 @@ func (cp *ChainPoller) latestBlockHeightWithRetry() (uint64, error) {
 		if err != nil {
 			return err
 		}
+
 		return nil
 	}, RtyAtt, RtyDel, RtyErr, retry.OnRetry(func(n uint, err error) {
 		cp.logger.Debug(
@@ -156,6 +157,7 @@ func (cp *ChainPoller) latestBlockHeightWithRetry() (uint64, error) {
 	})); err != nil {
 		return 0, err
 	}
+
 	return latestBlockHeight, nil
 }