diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java
index 3ffd899..33bf902 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/RevHubTestSuiteEngine.java
@@ -25,14 +25,12 @@ public class RevHubTestSuiteEngine extends CyberarmEngine {
 
         addState(new RevHubTestSuiteHubSelectionState(robot));
 
-//        addState(new RevHubTestSuiteMotorTestsState(robot));
-//        addState(new RevHubTestSuiteServoTestsState(robot));
-//        addState(new RevHubTestSuiteAnalogTestsState(robot));
-//        addState(new RevHubTestSuiteDigitalTestsState(robot));
+        addState(new RevHubTestSuiteMotorTestsState(robot));
+        addState(new RevHubTestSuiteServoTestsState(robot));
+        addState(new RevHubTestSuiteAnalogTestsState(robot));
+        addState(new RevHubTestSuiteDigitalTestsState(robot));
         addState(new RevHubTestSuiteI2CTestsState(robot));
 
-//         robot.stage = RevTestSuiteTestState.STAGE.ANALOG_SENSOR;
-         robot.stage = RevTestSuiteTestState.STAGE.I2C_SENSOR;
     }
 
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java
index 9e333fe..4cd428f 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteAnalogTestsState.java
@@ -1,5 +1,7 @@
 package org.timecrafters.diagnostics.rev_hub_test_suite.states;
 
+import android.util.Log;
+
 import com.qualcomm.robotcore.hardware.AnalogInput;
 import com.qualcomm.robotcore.hardware.Gamepad;
 
@@ -19,6 +21,7 @@ public class RevHubTestSuiteAnalogTestsState extends RevTestSuiteTestState {
         super.start();
 
         sensors = robot.testingControlHub ? robot.controlHubAnalogSensors : robot.expansionHubAnalogSensors;
+        robot.stage = STAGE.ANALOG_SENSOR;
     }
 
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteDigitalTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteDigitalTestsState.java
index f8113ca..9f267ae 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteDigitalTestsState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteDigitalTestsState.java
@@ -20,6 +20,7 @@ public class RevHubTestSuiteDigitalTestsState extends RevTestSuiteTestState {
         super.start();
 
         sensors = robot.testingControlHub ? robot.controlHubDigitalSensors : robot.expansionHubDigitalSensors;
+        robot.stage = STAGE.DIGITAL_SENSOR;
     }
 
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteI2CTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteI2CTestsState.java
index 4045e36..659f665 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteI2CTestsState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteI2CTestsState.java
@@ -23,6 +23,7 @@ public class RevHubTestSuiteI2CTestsState extends RevTestSuiteTestState {
         super.start();
 
         sensors = robot.testingControlHub ? robot.controlHubI2cSensors : robot.expansionHubI2cSensors;
+        robot.stage = STAGE.I2C_SENSOR;
     }
 
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java
index fea006c..c725ded 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java
@@ -33,7 +33,7 @@ public class RevHubTestSuiteMotorTestsState extends RevTestSuiteTestState {
         motors = robot.testingControlHub ? robot.controlHubMotors : robot.expansionHubMotors;
         lastMonitorTime = runTime();
 
-        nextStage();
+        robot.stage = STAGE.MOTOR_ENCODER_STEADY;
     }
 
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java
index 8b6fd05..217900e 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteServoTestsState.java
@@ -23,6 +23,8 @@ public class RevHubTestSuiteServoTestsState extends RevTestSuiteTestState {
 
         servos = robot.testingControlHub ? robot.controlHubServos : robot.expansionHubServos;
         lastMonitorTime = runTime();
+
+        robot.stage = STAGE.SERVO_SWEEP;
     }
 
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevTestSuiteTestState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevTestSuiteTestState.java
index 143bc32..e0743c0 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevTestSuiteTestState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevTestSuiteTestState.java
@@ -79,4 +79,11 @@ public class RevTestSuiteTestState extends CyberarmState {
             }
         }
     }
+
+    @Override
+    public void setHasFinished(boolean value) {
+        Log.i(TAG, "finished state: " + this.getClass() +", stage: " + robot.stage.toString());
+
+        super.setHasFinished(value);
+    }
 }