diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 87248952b..7bdd7e8f8 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -603,7 +603,7 @@ class AddressAndPort implements Comparable<AddressAndPort>, BytesMarshallable {
 
     @Override
     public String toString() {
-        return "AddressAndPort{" +
+        return "{" +
                 "address=" + numericToTextFormat(address) +
                 ", port=" + port +
                 '}';
@@ -851,7 +851,7 @@ class DiscoveryNodeBytesMarshallable implements BytesMarshallable {
 
         @Override
         public String toString() {
-            return "ProposedIdentifierWithHost{" +
+            return "{" +
                     "identifier=" + identifier +
                     ", timestamp=" + timestamp +
                     ", addressAndPort=" + addressAndPort +
@@ -917,12 +917,7 @@ class ConcurrentExpiryMap<K extends BytesMarshallable, V extends BytesMarshallab
 
     @Override
     public String toString() {
-        return "ConcurrentExpiryMap{" +
-                "map=" + map +
-                ", kClass=" + kClass +
-                ", vClass=" + vClass +
-                ", queue=" + queue +
-                '}';
+        return "ConcurrentExpiryMap{" + map + '}';
     }
 
     @Override
diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java
index 822f04bf6..06286c74e 100644
--- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java
+++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java
@@ -18,6 +18,7 @@ public class NodeDiscoveryTest {
         NetworkInterface networkInterface = ConcurrentExpiryMap.defaultNetworkInterface();
         Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
 
+        inetAddresses.nextElement();
         AddressAndPort ourAddressAndPort1 = new AddressAndPort(inetAddresses.nextElement().getAddress(),
                 (short) 1237);