diff --git a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java
index e5e17d34..b86d6b66 100644
--- a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java
+++ b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java
@@ -9,7 +9,7 @@ import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
-import electrosphere.entity.state.equip.ServerEquipState;
+import electrosphere.entity.state.equip.ServerToolbarState;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.movement.fall.ServerFallTree;
 import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
@@ -40,8 +40,8 @@ public class ServerAttackTreeTests extends EntityTestTemplate {
 
         //equip
         Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana);
-        ServerEquipState serverEquipState = ServerEquipState.getServerEquipState(creature);
-        serverEquipState.commandAttemptEquip(inInventoryItem, serverEquipState.getEquipPoint("handsCombined"));
+        ServerToolbarState serverToolbarState = ServerToolbarState.getServerToolbarState(creature);
+        serverToolbarState.attemptEquip(inInventoryItem, 0);
         
         //Get the server-side player's trees
         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature);
@@ -75,8 +75,8 @@ public class ServerAttackTreeTests extends EntityTestTemplate {
 
         //equip
         Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana);
-        ServerEquipState serverEquipState = ServerEquipState.getServerEquipState(creature);
-        serverEquipState.commandAttemptEquip(inInventoryItem, serverEquipState.getEquipPoint("handsCombined"));
+        ServerToolbarState serverToolbarState = ServerToolbarState.getServerToolbarState(creature);
+        serverToolbarState.attemptEquip(inInventoryItem, 0);
         
         //Get the server-side player's trees
         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature);