diff --git a/bitswap_test.go b/bitswap_test.go
index 8037d163977140c8d65c201e5df91b6bbeb7cd56..f28112d79e1c2987a0ff5a71e4a9ccca2f0049fa 100644
--- a/bitswap_test.go
+++ b/bitswap_test.go
@@ -12,7 +12,6 @@ import (
 	deciface "github.com/ipfs/go-bitswap/decision"
 	decision "github.com/ipfs/go-bitswap/internal/decision"
 	bssession "github.com/ipfs/go-bitswap/internal/session"
-	"github.com/ipfs/go-bitswap/message"
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	pb "github.com/ipfs/go-bitswap/message/pb"
 	testinstance "github.com/ipfs/go-bitswap/testinstance"
@@ -149,7 +148,7 @@ func TestUnwantedBlockNotAdded(t *testing.T) {
 
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	block := blocks.NewBlock([]byte("block"))
-	bsMessage := message.New(true)
+	bsMessage := bsmsg.New(true)
 	bsMessage.AddBlock(block)
 
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
@@ -215,7 +214,7 @@ func TestPendingBlockAdded(t *testing.T) {
 
 	// Simulate receiving a message which contains the block in the "tofetch" queue
 	lastBlock := blks[len(blks)-1]
-	bsMessage := message.New(true)
+	bsMessage := bsmsg.New(true)
 	bsMessage.AddBlock(lastBlock)
 	unknownPeer := peer.ID("QmUHfvCQrzyR6vFXmeyCptfCWedfcmfa12V6UuziDtrw23")
 	instance.Exchange.ReceiveMessage(oneSecCtx, unknownPeer, bsMessage)
diff --git a/internal/decision/engine_test.go b/internal/decision/engine_test.go
index b4f3d068e0b219dce620dd5f7c53c3b1378c8727..5c547ffef4f2481cf92a7cfab3a96b7723b23f30 100644
--- a/internal/decision/engine_test.go
+++ b/internal/decision/engine_test.go
@@ -183,10 +183,9 @@ func peerIsPartner(p peer.ID, e *Engine) bool {
 }
 
 func TestOutboxClosedWhenEngineClosed(t *testing.T) {
-	ctx := context.Background()
 	t.SkipNow() // TODO implement *Engine.Close
 	e := newEngine(blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore())), 4, &fakePeerTagger{}, "localhost", 0, NewTestScoreLedger(shortTerm, nil))
-	e.StartWorkers(ctx, process.WithTeardown(func() error { return nil }))
+	e.StartWorkers(context.Background(), process.WithTeardown(func() error { return nil }))
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
diff --git a/internal/messagequeue/messagequeue.go b/internal/messagequeue/messagequeue.go
index 24e80974b191fcca34c78aa35f4f8ef2246aeca1..908f129434a4d5559b48d26a6a13cd82456d2e54 100644
--- a/internal/messagequeue/messagequeue.go
+++ b/internal/messagequeue/messagequeue.go
@@ -9,7 +9,6 @@ import (
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	pb "github.com/ipfs/go-bitswap/message/pb"
 	bsnet "github.com/ipfs/go-bitswap/network"
-	"github.com/ipfs/go-bitswap/wantlist"
 	bswl "github.com/ipfs/go-bitswap/wantlist"
 	cid "github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
@@ -142,7 +141,7 @@ func (r *recallWantlist) RemoveType(c cid.Cid, wtype pb.Message_Wantlist_WantTyp
 //
 // Returns true if the want was marked as sent. Returns false if the want wasn't
 // pending.
-func (r *recallWantlist) MarkSent(e wantlist.Entry) bool {
+func (r *recallWantlist) MarkSent(e bswl.Entry) bool {
 	if !r.pending.RemoveType(e.Cid, e.WantType) {
 		return false
 	}
diff --git a/internal/messagequeue/messagequeue_test.go b/internal/messagequeue/messagequeue_test.go
index 4af3000ad70af04d62116a9288c5fe7fd631170f..ca0ac7198e1a8a227209a9c956326c25f6495968 100644
--- a/internal/messagequeue/messagequeue_test.go
+++ b/internal/messagequeue/messagequeue_test.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/ipfs/go-bitswap/internal/testutil"
-	"github.com/ipfs/go-bitswap/message"
 	pb "github.com/ipfs/go-bitswap/message/pb"
 	cid "github.com/ipfs/go-cid"
 
@@ -251,7 +250,7 @@ func TestSendingMessagesPriority(t *testing.T) {
 	if totalEntriesLength(messages) != len(wantHaves)+len(wantBlocks) {
 		t.Fatal("wrong number of wants")
 	}
-	byCid := make(map[cid.Cid]message.Entry)
+	byCid := make(map[cid.Cid]bsmsg.Entry)
 	for _, entry := range messages[0] {
 		byCid[entry.Cid] = entry
 	}
diff --git a/network/ipfs_impl_test.go b/network/ipfs_impl_test.go
index 3ad047f61c69fe3f59bf40507b18ccc39f0b4ade..475fcfc6a4fb62e9f2fef2648ff12bb664958c7d 100644
--- a/network/ipfs_impl_test.go
+++ b/network/ipfs_impl_test.go
@@ -67,7 +67,7 @@ func (r *receiver) PeerDisconnected(p peer.ID) {
 	r.connectionEvent <- false
 }
 
-var mockNetErr = fmt.Errorf("network err")
+var errMockNetErr = fmt.Errorf("network err")
 
 type ErrStream struct {
 	network.Stream
@@ -115,7 +115,7 @@ func (eh *ErrHost) NewStream(ctx context.Context, p peer.ID, pids ...protocol.ID
 	defer eh.lk.Unlock()
 
 	if eh.err != nil {
-		return nil, mockNetErr
+		return nil, errMockNetErr
 	}
 	if eh.timingOut {
 		return nil, context.DeadlineExceeded
@@ -337,7 +337,7 @@ func TestMessageResendAfterError(t *testing.T) {
 
 	// Return an error from the networking layer the next time we try to send
 	// a message
-	eh.setError(mockNetErr)
+	eh.setError(errMockNetErr)
 
 	go func() {
 		time.Sleep(testSendErrorBackoff / 2)