diff --git a/precompiles/avs/avs_test.go b/precompiles/avs/avs_test.go
index 1171d328e..5ea6480a7 100644
--- a/precompiles/avs/avs_test.go
+++ b/precompiles/avs/avs_test.go
@@ -141,7 +141,6 @@ func (suite *AVSManagerPrecompileSuite) TestRegisterAVS() {
 	for _, tc := range testcases {
 		tc := tc
 		suite.Run(tc.name, func() {
-
 			baseFee := suite.App.FeeMarketKeeper.GetBaseFee(suite.Ctx)
 
 			// malleate testcase
diff --git a/precompiles/avs/query_test.go b/precompiles/avs/query_test.go
index f6f677258..4fcf4749c 100644
--- a/precompiles/avs/query_test.go
+++ b/precompiles/avs/query_test.go
@@ -1,16 +1,18 @@
 package avs_test
 
 import (
-	sdkmath "cosmossdk.io/math"
 	"fmt"
+	"math/big"
+	"time"
+
+	sdkmath "cosmossdk.io/math"
+
 	avsManagerPrecompile "github.com/ExocoreNetwork/exocore/precompiles/avs"
 	exocmn "github.com/ExocoreNetwork/exocore/precompiles/common"
 	assetstype "github.com/ExocoreNetwork/exocore/x/assets/types"
 	operatorKeeper "github.com/ExocoreNetwork/exocore/x/operator/keeper"
 	"github.com/ExocoreNetwork/exocore/x/operator/types"
 	"github.com/ethereum/go-ethereum/common"
-	"math/big"
-	"time"
 
 	"github.com/ethereum/go-ethereum/core/vm"
 )
@@ -107,7 +109,6 @@ func (suite *AVSManagerPrecompileSuite) TestGetOptedInOperatorAccAddrs() {
 				suite.Require().NoError(err, "failed to unpack output", err)
 				suite.Require().Equal(1, len(out))
 				suite.Require().Equal(operatorAddress, out[0])
-
 			},
 			100000,
 			false,
@@ -197,7 +198,6 @@ func (suite *AVSManagerPrecompileSuite) TestAVSUSDValue() {
 				err := s.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetAVSUSDValue, bz)
 				s.Require().NoError(err, "failed to unpack output", err)
 				s.Require().Equal(expectedUSDvalue.BigInt(), out)
-
 			},
 			100000,
 			false,
diff --git a/precompiles/avs/setup_test.go b/precompiles/avs/setup_test.go
index ea02896b5..385b52a8c 100644
--- a/precompiles/avs/setup_test.go
+++ b/precompiles/avs/setup_test.go
@@ -1,10 +1,11 @@
 package avs_test
 
 import (
+	"testing"
+
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"testing"
 
 	"github.com/ExocoreNetwork/exocore/precompiles/avs"
 	"github.com/ExocoreNetwork/exocore/testutil"
diff --git a/precompiles/avs/utils_test.go b/precompiles/avs/utils_test.go
index 5bbbaceaa..427456676 100644
--- a/precompiles/avs/utils_test.go
+++ b/precompiles/avs/utils_test.go
@@ -173,7 +173,6 @@ func (suite *AVSManagerPrecompileSuite) TestOptInList() {
 	suite.NoError(err)
 
 	suite.Contains(avsList, suite.avsAddr)
-
 }
 
 func (suite *AVSManagerPrecompileSuite) TestOptOut() {
diff --git a/testutil/abci.go b/testutil/abci.go
index c47dd2fc5..7c8bccbf8 100644
--- a/testutil/abci.go
+++ b/testutil/abci.go
@@ -190,7 +190,7 @@ func BroadcastTxBytes(app *app.ExocoreApp, txEncoder sdk.TxEncoder, tx sdk.Tx) (
 	req := abci.RequestDeliverTx{Tx: bz}
 	res := app.BaseApp.DeliverTx(req)
 	if res.Code != 0 {
-		return abci.ResponseDeliverTx{}, errorsmod.Wrapf(errortypes.ErrInvalidRequest, res.Log)
+		return abci.ResponseDeliverTx{}, errortypes.ErrInvalidRequest.Wrap(res.Log)
 	}
 
 	return res, nil
@@ -237,7 +237,7 @@ func checkTxBytes(app *app.ExocoreApp, txEncoder sdk.TxEncoder, tx sdk.Tx) (abci
 	req := abci.RequestCheckTx{Tx: bz}
 	res := app.BaseApp.CheckTx(req)
 	if res.Code != 0 {
-		return abci.ResponseCheckTx{}, errorsmod.Wrapf(errortypes.ErrInvalidRequest, res.Log)
+		return abci.ResponseCheckTx{}, errortypes.ErrInvalidRequest.Wrap(res.Log)
 	}
 
 	return res, nil
diff --git a/x/feedistribution/keeper/allocation.go b/x/feedistribution/keeper/allocation.go
index 4b4d03e68..a00802573 100644
--- a/x/feedistribution/keeper/allocation.go
+++ b/x/feedistribution/keeper/allocation.go
@@ -1,12 +1,13 @@
 package keeper
 
 import (
+	"sort"
+
 	"cosmossdk.io/math"
 	avstypes "github.com/ExocoreNetwork/exocore/x/avs/types"
 	"github.com/ExocoreNetwork/exocore/x/feedistribution/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"sort"
 )
 
 // Based on the epoch, AllocateTokens performs reward and fee distribution to all validators.
diff --git a/x/feedistribution/keeper/hooks_test.go b/x/feedistribution/keeper/hooks_test.go
index 3b2564a1b..dc3247a3c 100644
--- a/x/feedistribution/keeper/hooks_test.go
+++ b/x/feedistribution/keeper/hooks_test.go
@@ -111,7 +111,7 @@ func (suite *KeeperTestSuite) prepare() {
 	suite.CheckLengthOfValidatorUpdates(0, nil, "delegate but not self delegate")
 	// mark it as self delegation
 	err = suite.App.DelegationKeeper.AssociateOperatorWithStaker(
-		suite.Ctx, lzID, operatorAddress, staker,
+		suite.Ctx, lzID, operatorAddress, staker.Bytes(),
 	)
 	suite.NoError(err)
 	suite.CheckLengthOfValidatorUpdates(0, nil, "self delegate but below min")