diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go
index dbf75b92cf..093c078786 100644
--- a/swarm/api/http/server_test.go
+++ b/swarm/api/http/server_test.go
@@ -292,7 +292,7 @@ func TestBzzFeed(t *testing.T) {
 	if resp.StatusCode != http.StatusOK {
 		t.Fatalf("err %s", resp.Status)
 	}
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go
index 3593247e8e..f0d2666288 100644
--- a/swarm/network/protocol_test.go
+++ b/swarm/network/protocol_test.go
@@ -153,18 +153,7 @@ func newBzzHandshakeTester(t *testing.T, n int, addr *BzzAddr, lightNode bool) *
 
 // should test handshakes in one exchange? parallelisation
 func (s *bzzTester) testHandshake(lhs, rhs *HandshakeMsg, disconnects ...*p2ptest.Disconnect) error {
-	//TODO: peers is not used. fix test.
-	var peers []enode.ID
-	id := rhs.Addr.ID()
-	if len(disconnects) > 0 {
-		for _, d := range disconnects {
-			peers = append(peers, d.Peer)
-		}
-	} else {
-		peers = []enode.ID{id}
-	}
-
-	if err := s.TestExchanges(HandshakeMsgExchange(lhs, rhs, id)...); err != nil {
+	if err := s.TestExchanges(HandshakeMsgExchange(lhs, rhs, rhs.Addr.ID())...); err != nil {
 		return err
 	}
 
diff --git a/swarm/storage/feed/id.go b/swarm/storage/feed/id.go
index 0f8ae34a90..41d1596dfe 100644
--- a/swarm/storage/feed/id.go
+++ b/swarm/storage/feed/id.go
@@ -92,11 +92,7 @@ func (u *ID) binaryGet(serializedData []byte) error {
 	}
 	cursor += feedLength
 
-	if err := u.Epoch.UnmarshalBinary(serializedData[cursor : cursor+lookup.EpochLength]); err != nil {
-		return err
-	}
-
-	return nil
+	return u.Epoch.UnmarshalBinary(serializedData[cursor : cursor+lookup.EpochLength])
 }
 
 // FromValues deserializes this instance from a string key-value store