diff --git a/src/main/java/org/csveed/token/TokenState.java b/src/main/java/org/csveed/token/TokenState.java
index 15ec2abc..ce35c2c5 100644
--- a/src/main/java/org/csveed/token/TokenState.java
+++ b/src/main/java/org/csveed/token/TokenState.java
@@ -26,7 +26,16 @@ public enum TokenState {
      * @return the token state
      */
     public TokenState next() {
-        return values()[(ordinal() + 1) % 3];
+        switch (this) {
+            case RESET:
+                return START;
+            case START:
+                return PROCESSING;
+            case PROCESSING:
+                return RESET;
+            default:
+                throw new IllegalStateException("Unknown TokenState: " + this);
+        }
     }
 
     /**
diff --git a/src/test/java/org/csveed/bean/conversion/BeanWrapperTest.java b/src/test/java/org/csveed/bean/conversion/BeanWrapperTest.java
index 2df98672..54f833c4 100644
--- a/src/test/java/org/csveed/bean/conversion/BeanWrapperTest.java
+++ b/src/test/java/org/csveed/bean/conversion/BeanWrapperTest.java
@@ -310,7 +310,7 @@ void getBooleanObject() throws Exception {
     @Test
     void setBooleanObject() throws Exception {
         beanWrapper.setProperty(properties.fromName(new Column("booleanObject")), "on");
-        assertEquals(Boolean.TRUE, bean.getBooleanObject());
+        assertTrue(bean.getBooleanObject());
     }
 
     /**