diff --git a/bchain/coins/eth/erc20_test.go b/bchain/coins/eth/erc20_test.go
index d9e23586..60e19f9b 100644
--- a/bchain/coins/eth/erc20_test.go
+++ b/bchain/coins/eth/erc20_test.go
@@ -1,4 +1,4 @@
-// build unittest
+// +build unittest
 
 package eth
 
@@ -15,7 +15,7 @@ func TestErc20_erc20GetTransfersFromLog(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    []*rpcLog
-		want    []Erc20Transfer
+		want    []bchain.Erc20Transfer
 		wantErr bool
 	}{
 		{
@@ -31,7 +31,7 @@ func TestErc20_erc20GetTransfersFromLog(t *testing.T) {
 					Data: "0x0000000000000000000000000000000000000000000000000000000000000123",
 				},
 			},
-			want: []Erc20Transfer{
+			want: []bchain.Erc20Transfer{
 				{
 					Contract: "0x76a45e8976499ab9ae223cc584019341d5a84e96",
 					From:     "0x2aacf811ac1a60081ea39f7783c0d26c500871a8",
@@ -81,7 +81,7 @@ func TestErc20_erc20GetTransfersFromLog(t *testing.T) {
 					Data: "0x0000000000000000000000004bda106325c335df99eab7fe363cac8a0ba2a24d000000000000000000000000c778417e063141139fce010982780140aa0cd5ab0000000000000000000000000d0f936ee4c93e25944694d6c121de94d9760f1100000000000000000000000000000000000000000000000000031855667df7a80000000000000000000000000000000000000000000000006a8313d60b1f800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 				},
 			},
-			want: []Erc20Transfer{
+			want: []bchain.Erc20Transfer{
 				{
 					Contract: "0x0d0f936ee4c93e25944694d6c121de94d9760f11",
 					From:     "0x6f44cceb49b4a5812d54b6f494fc2febf25511ed",
diff --git a/tests/rpc/rpc.go b/tests/rpc/rpc.go
index ea633c77..ff430d78 100644
--- a/tests/rpc/rpc.go
+++ b/tests/rpc/rpc.go
@@ -220,7 +220,7 @@ func testMempoolSync(t *testing.T, h *TestHandler) {
 				if err != nil {
 					t.Fatalf("address %q: %s", a, err)
 				}
-				if !containsString(got, txid) {
+				if !containsTx(got, txid) {
 					t.Errorf("ResyncMempool() - for address %s, transaction %s wasn't found in mempool", a, txid)
 					return
 				}
@@ -401,9 +401,9 @@ func intersect(a, b []string) []string {
 	return res
 }
 
-func containsString(slice []string, s string) bool {
-	for i := range slice {
-		if slice[i] == s {
+func containsTx(o []bchain.Outpoint, tx string) bool {
+	for i := range o {
+		if o[i].Txid == tx {
 			return true
 		}
 	}
diff --git a/tests/sync/connectblocks.go b/tests/sync/connectblocks.go
index 50d91ca0..36437192 100644
--- a/tests/sync/connectblocks.go
+++ b/tests/sync/connectblocks.go
@@ -107,7 +107,7 @@ func verifyBlockInfo(t *testing.T, d *db.RocksDB, h *TestHandler, rng Range) {
 func verifyTransactions(t *testing.T, d *db.RocksDB, h *TestHandler, rng Range) {
 	type txInfo struct {
 		txid     string
-		vout     uint32
+		vout     int32
 		isOutput bool
 	}
 	addr2txs := make(map[string][]txInfo)
@@ -122,13 +122,13 @@ func verifyTransactions(t *testing.T, d *db.RocksDB, h *TestHandler, rng Range)
 		for _, tx := range block.TxDetails {
 			for _, vin := range tx.Vin {
 				for _, a := range vin.Addresses {
-					addr2txs[a] = append(addr2txs[a], txInfo{tx.Txid, vin.Vout, false})
+					addr2txs[a] = append(addr2txs[a], txInfo{tx.Txid, int32(vin.Vout), false})
 					checkMap[a] = append(checkMap[a], false)
 				}
 			}
 			for _, vout := range tx.Vout {
 				for _, a := range vout.ScriptPubKey.Addresses {
-					addr2txs[a] = append(addr2txs[a], txInfo{tx.Txid, vout.N, true})
+					addr2txs[a] = append(addr2txs[a], txInfo{tx.Txid, int32(vout.N), true})
 					checkMap[a] = append(checkMap[a], false)
 				}
 			}
@@ -136,7 +136,7 @@ func verifyTransactions(t *testing.T, d *db.RocksDB, h *TestHandler, rng Range)
 	}
 
 	for addr, txs := range addr2txs {
-		err := d.GetTransactions(addr, rng.Lower, rng.Upper, func(txid string, vout uint32, isOutput bool) error {
+		err := d.GetTransactions(addr, rng.Lower, rng.Upper, func(txid string, vout int32, isOutput bool) error {
 			for i, tx := range txs {
 				if txid == tx.txid && vout == tx.vout && isOutput == tx.isOutput {
 					checkMap[addr][i] = true
diff --git a/tests/sync/handlefork.go b/tests/sync/handlefork.go
index f51d03a2..2ed99cfa 100644
--- a/tests/sync/handlefork.go
+++ b/tests/sync/handlefork.go
@@ -129,7 +129,7 @@ func verifyTransactions2(t *testing.T, d *db.RocksDB, rng Range, addr2txs map[st
 			checkMap[txid] = false
 		}
 
-		err := d.GetTransactions(addr, rng.Lower, rng.Upper, func(txid string, vout uint32, isOutput bool) error {
+		err := d.GetTransactions(addr, rng.Lower, rng.Upper, func(txid string, vout int32, isOutput bool) error {
 			if isOutput {
 				checkMap[txid] = true
 			}