diff --git a/p2p/key.go b/p2p/key.go
index 4d1ecd82f..3f38b48a9 100644
--- a/p2p/key.go
+++ b/p2p/key.go
@@ -8,6 +8,7 @@ import (
 
 	crypto "github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/ed25519"
+	"github.com/tendermint/tendermint/crypto/tmhash"
 	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
@@ -16,7 +17,7 @@ type ID string
 
 // IDByteLength is the length of a crypto.Address. Currently only 20.
 // TODO: support other length addresses ?
-const IDByteLength = 20
+const IDByteLength = tmhash.Size
 
 //------------------------------------------------------------------------------
 // Persistent peer ID
diff --git a/p2p/netaddress_test.go b/p2p/netaddress_test.go
index 7d806dbd8..e7b184a76 100644
--- a/p2p/netaddress_test.go
+++ b/p2p/netaddress_test.go
@@ -22,49 +22,52 @@ func TestNewNetAddress(t *testing.T) {
 
 func TestNewNetAddressStringWithOptionalID(t *testing.T) {
 	testCases := []struct {
+		name     string
 		addr     string
 		expected string
 		correct  bool
 	}{
-		{"127.0.0.1:8080", "127.0.0.1:8080", true},
-		{"tcp://127.0.0.1:8080", "127.0.0.1:8080", true},
-		{"udp://127.0.0.1:8080", "127.0.0.1:8080", true},
-		{"udp//127.0.0.1:8080", "", false},
+		{"no node id, no protocol", "127.0.0.1:8080", "127.0.0.1:8080", true},
+		{"no node id, tcp input", "tcp://127.0.0.1:8080", "127.0.0.1:8080", true},
+		{"no node id, udp input", "udp://127.0.0.1:8080", "127.0.0.1:8080", true},
+		{"malformed udp input", "udp//127.0.0.1:8080", "", false},
 		// {"127.0.0:8080", false},
-		{"notahost", "", false},
-		{"127.0.0.1:notapath", "", false},
-		{"notahost:8080", "", false},
-		{"8082", "", false},
-		{"127.0.0:8080000", "", false},
-
-		{"deadbeef@127.0.0.1:8080", "", false},
-		{"this-isnot-hex@127.0.0.1:8080", "", false},
-		{"xxxxbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "", false},
-		{"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", true},
-
-		{"tcp://deadbeef@127.0.0.1:8080", "", false},
-		{"tcp://this-isnot-hex@127.0.0.1:8080", "", false},
-		{"tcp://xxxxbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "", false},
-		{"tcp://deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", true},
-
-		{"tcp://@127.0.0.1:8080", "", false},
-		{"tcp://@", "", false},
-		{"tcp://:26656", "", false},
-		{"", "", false},
-		{"@", "", false},
-		{" @", "", false},
-		{" @ ", "", false},
+		{"invalid host", "notahost", "", false},
+		{"invalid port", "127.0.0.1:notapath", "", false},
+		{"invalid host w/ port", "notahost:8080", "", false},
+		{"just a port", "8082", "", false},
+		{"non-existent port", "127.0.0:8080000", "", false},
+
+		{"too short nodeId", "deadbeef@127.0.0.1:8080", "", false},
+		{"too short, not hex nodeId", "this-isnot-hex@127.0.0.1:8080", "", false},
+		{"not hex nodeId", "xxxxbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "", false},
+		{"correct nodeId", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", true},
+
+		{"too short nodeId w/tcp", "tcp://deadbeef@127.0.0.1:8080", "", false},
+		{"too short notHex nodeId w/tcp", "tcp://this-isnot-hex@127.0.0.1:8080", "", false},
+		{"notHex nodeId w/tcp", "tcp://xxxxbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "", false},
+		{"correct nodeId w/tcp", "tcp://deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef@127.0.0.1:8080", true},
+
+		{"no node id when expected", "tcp://@127.0.0.1:8080", "", false},
+		{"no node id or IP", "tcp://@", "", false},
+		{"tcp no host, w/ port", "tcp://:26656", "", false},
+		{"empty", "", "", false},
+		{"node id delimiter 1", "@", "", false},
+		{"node id delimiter 2", " @", "", false},
+		{"node id delimiter 3", " @ ", "", false},
 	}
 
 	for _, tc := range testCases {
-		addr, err := NewNetAddressStringWithOptionalID(tc.addr)
-		if tc.correct {
-			if assert.Nil(t, err, tc.addr) {
-				assert.Equal(t, tc.expected, addr.String())
+		t.Run(tc.name, func(t *testing.T) {
+			addr, err := NewNetAddressStringWithOptionalID(tc.addr)
+			if tc.correct {
+				if assert.Nil(t, err, tc.addr) {
+					assert.Equal(t, tc.expected, addr.String())
+				}
+			} else {
+				assert.NotNil(t, err, tc.addr)
 			}
-		} else {
-			assert.NotNil(t, err, tc.addr)
-		}
+		})
 	}
 }