diff --git a/test/dorkbox/network/IdleTest.java b/test/dorkbox/network/IdleTest.java
index 209d6857..9c44c46f 100644
--- a/test/dorkbox/network/IdleTest.java
+++ b/test/dorkbox/network/IdleTest.java
@@ -49,7 +49,7 @@ class IdleTest extends BaseTest {
 
     @Test
     public
-    void InputStreamSender() throws SecurityException, IOException {
+    void InputStreamSenderTCP() throws SecurityException, IOException {
         final int largeDataSize = 12345;
 
         System.err.println("-- TCP");
@@ -59,10 +59,15 @@ class IdleTest extends BaseTest {
         configuration.serialization = Serialization.DEFAULT(false, false, null);
 
         streamSpecificType(largeDataSize, configuration, ConnectionType.TCP);
+    }
 
+    @Test
+    public
+    void InputStreamSenderUDP() throws SecurityException, IOException {
+        final int largeDataSize = 12345;
 
         System.err.println("-- UDP");
-        configuration = new Configuration();
+        Configuration configuration = new Configuration();
         configuration.tcpPort = tcpPort;
         configuration.udpPort = udpPort;
         configuration.host = host;
@@ -76,7 +81,7 @@ class IdleTest extends BaseTest {
     // have to test sending objects
     @Test
     public
-    void ObjectSender() throws SecurityException, IOException {
+    void ObjectSenderTCP() throws SecurityException, IOException {
         final Data mainData = new Data();
         populateData(mainData);
 
@@ -89,10 +94,18 @@ class IdleTest extends BaseTest {
         register(configuration.serialization);
 
         sendObject(mainData, configuration, ConnectionType.TCP);
+    }
+
+    // have to test sending objects
+    @Test
+    public
+    void ObjectSenderUDP() throws SecurityException, IOException {
+        final Data mainData = new Data();
+        populateData(mainData);
 
 
         System.err.println("-- UDP");
-        configuration = new Configuration();
+        Configuration configuration = new Configuration();
         configuration.tcpPort = tcpPort;
         configuration.udpPort = udpPort;
         configuration.host = host;
@@ -102,8 +115,6 @@ class IdleTest extends BaseTest {
         sendObject(mainData, configuration, ConnectionType.TCP);
     }
 
-
-
     private
     void sendObject(final Data mainData, Configuration configuration, final ConnectionType type)
                     throws SecurityException, IOException {
diff --git a/test/dorkbox/network/ListenerTest.java b/test/dorkbox/network/ListenerTest.java
index 5e9e0410..e0bb073f 100644
--- a/test/dorkbox/network/ListenerTest.java
+++ b/test/dorkbox/network/ListenerTest.java
@@ -256,8 +256,7 @@ class ListenerTest extends BaseTest {
                   @Override
                   public
                   void received(Connection connection, String string) {
-                      if (ListenerTest.this.count.get() < ListenerTest.this.limit) {
-                          ListenerTest.this.count.getAndIncrement();
+                      if (ListenerTest.this.count.getAndIncrement() < ListenerTest.this.limit) {
                           connection.send()
                                     .TCP(string);
                       }
@@ -276,7 +275,8 @@ class ListenerTest extends BaseTest {
 
         waitForThreads();
 
-        assertEquals(this.limit, this.count.get());
+        // -1 BECAUSE we are `getAndIncrement` for each check earlier
+        assertEquals(this.limit, this.count.get()-1);
 
         assertTrue(this.check1.get());
         assertTrue(this.check2.get());