diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ArmTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ArmTest.java
index 79a18c7..66c9a21 100644
--- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ArmTest.java
+++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ArmTest.java
@@ -34,7 +34,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
 import com.qualcomm.robotcore.hardware.Gamepad;
 import com.qualcomm.robotcore.util.ElapsedTime;
 
-import org.firstinspires.ftc.teamcode.subsystem.ArmSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.ArmActionsSubsystem;
 
 @TeleOp(name = "Arm Test", group = "Debug")
 public class ArmTest extends LinearOpMode {
@@ -48,7 +48,7 @@ public class ArmTest extends LinearOpMode {
         /*
          * Instantiate Arm
          */
-        ArmSubsystem arm = new ArmSubsystem(hardwareMap, telemetry);
+        ArmActionsSubsystem arm = new ArmActionsSubsystem(hardwareMap);
 
         /*
          * Instantiate gamepad state holders
@@ -74,10 +74,6 @@ public class ArmTest extends LinearOpMode {
                 arm.toBucketPosition();
             }
 
-            if (currentGamepad1.cross && !previousGamepad1.cross) {
-                arm.switchState();
-            }
-
             if (currentGamepad1.left_bumper && !previousGamepad1.left_bumper) {
                 arm.setPosition(arm.getPosition() - .05);
             }
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ClawTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ClawTest.java
index a16f1ea..1b051cd 100644
--- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ClawTest.java
+++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ClawTest.java
@@ -34,7 +34,8 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
 import com.qualcomm.robotcore.hardware.Gamepad;
 import com.qualcomm.robotcore.util.ElapsedTime;
 
-import org.firstinspires.ftc.teamcode.subsystem.ClawSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.ClawActionsSubsystem;
+
 
 @TeleOp(name = "Claw Test", group = "Debug")
 public class ClawTest extends LinearOpMode {
@@ -48,7 +49,7 @@ public class ClawTest extends LinearOpMode {
         /*
          * Instantiate Claw
          */
-        ClawSubsystem claw = new ClawSubsystem(hardwareMap, telemetry);
+        ClawActionsSubsystem claw = new ClawActionsSubsystem(hardwareMap);
 
         /*
          * Instantiate gamepad state holders
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/WristTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/WristTest.java
index a72498a..1f0d4f1 100644
--- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/WristTest.java
+++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/WristTest.java
@@ -36,7 +36,6 @@ import com.qualcomm.robotcore.hardware.Gamepad;
 import com.qualcomm.robotcore.util.ElapsedTime;
 
 import org.firstinspires.ftc.teamcode.subsystem.WristActionsSubsystem;
-import org.firstinspires.ftc.teamcode.subsystem.WristSubsystem;
 
 @TeleOp(name = "Wrist Test", group = "Debug")
 public class WristTest extends LinearOpMode {