diff --git a/src/test/java/electrosphere/entity/state/attack/ClientAttackTreeTests.java b/src/test/java/electrosphere/entity/state/attack/ClientAttackTreeTests.java
index dfee945e..4d76ef88 100644
--- a/src/test/java/electrosphere/entity/state/attack/ClientAttackTreeTests.java
+++ b/src/test/java/electrosphere/entity/state/attack/ClientAttackTreeTests.java
@@ -27,10 +27,10 @@ public class ClientAttackTreeTests extends EntityTestTemplate {
         //warm up engine
         TestEngineUtils.simulateFrames(1);
         
-        //spy on the client-side player's attack state
+        //Get the client-side player's attack state
         ClientAttackTree clientAttackTree = ClientAttackTree.getClientAttackTree(Globals.playerEntity);
 
-        //spy on the server-side player's attack tree
+        //Get the server-side player's attack tree
         int serverIdForClientEntity = Globals.clientSceneWrapper.mapClientToServerId(Globals.playerEntity.getId());
         Entity serverPlayerEntity = EntityLookupUtils.getEntityById(serverIdForClientEntity);
         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(serverPlayerEntity);
diff --git a/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java b/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java
index 365d5ca5..e436626f 100644
--- a/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java
+++ b/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java
@@ -109,6 +109,7 @@ public class ClientEquipStateTests extends EntityTestTemplate {
 
         //try equipping
         UnrelationalInventoryState inventory = InventoryUtils.getNaturalInventory(Globals.playerEntity);
+        assertEquals(1, inventory.getItems().size());
         Entity inInventoryItem = inventory.getItems().get(0);
         ClientEquipState clientEquipState = ClientEquipState.getClientEquipState(Globals.playerEntity);
         clientEquipState.commandAttemptEquip(inInventoryItem, clientEquipState.getEquipPoint("handsCombined"));
diff --git a/src/test/java/testutils/EngineInit.java b/src/test/java/testutils/EngineInit.java
index 20273419..42ea2a3e 100644
--- a/src/test/java/testutils/EngineInit.java
+++ b/src/test/java/testutils/EngineInit.java
@@ -9,7 +9,7 @@ import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
 public class EngineInit {
 
     //The maximum number of frames to wait before failing the startup routine
-    public static final int MAX_FRAMES_TO_WAIT = 1000;
+    public static final int MAX_FRAMES_TO_WAIT = 100;
     
     /**
      * Setups up a locally-connected client and server that have loaded a test scene