diff --git a/forage-android/src/main/java/com/joinforage/forage/android/core/element/state/ElementState.kt b/forage-android/src/main/java/com/joinforage/forage/android/core/element/state/ElementState.kt
index 8c15a884..8fb4e2e5 100644
--- a/forage-android/src/main/java/com/joinforage/forage/android/core/element/state/ElementState.kt
+++ b/forage-android/src/main/java/com/joinforage/forage/android/core/element/state/ElementState.kt
@@ -18,7 +18,7 @@ internal val INITIAL_PIN_ELEMENT_STATE = ElementState<PinDetails>(
     isFocused = false,
     isBlurred = true,
     isEmpty = true,
-    isValid = true,
+    isValid = false,
     isComplete = false,
     validationError = null,
     details = null
diff --git a/forage-android/src/test/java/com/joinforage/forage/android/core/element/state/ElementStateManagerTest.kt b/forage-android/src/test/java/com/joinforage/forage/android/core/element/state/ElementStateManagerTest.kt
index 33a3566f..cb7585a3 100644
--- a/forage-android/src/test/java/com/joinforage/forage/android/core/element/state/ElementStateManagerTest.kt
+++ b/forage-android/src/test/java/com/joinforage/forage/android/core/element/state/ElementStateManagerTest.kt
@@ -7,7 +7,22 @@ import org.junit.Test
 class ElementStateManagerTest {
 
     @Test
-    fun testGetState() {
+    fun testGetStatePIN() {
+        val manager = PinElementStateManager.forEmptyInput()
+        val state = manager.getState()
+        assertThat(state.isFocused).isEqualTo(INITIAL_PIN_ELEMENT_STATE.isFocused)
+        assertThat(state.isBlurred).isEqualTo(INITIAL_PIN_ELEMENT_STATE.isBlurred)
+        assertThat(state.isEmpty).isEqualTo(INITIAL_PIN_ELEMENT_STATE.isEmpty)
+        assertThat(state.isValid).isEqualTo(INITIAL_PIN_ELEMENT_STATE.isValid)
+        assertThat(state.isComplete).isEqualTo(INITIAL_PIN_ELEMENT_STATE.isComplete)
+        assertThat(state.validationError).isEqualTo(INITIAL_PIN_ELEMENT_STATE.validationError)
+        // TODO: Compiler is very confused about accessing the state.details for the PIN
+        // This test fails because of it
+        assertThat(state.details).isEqualTo(INITIAL_PIN_ELEMENT_STATE.details)
+    }
+
+    @Test
+    fun testGetStatePAN() {
         val manager = PanElementStateManager.forEmptyInput()
         val state = manager.getState()
         assertThat(state.isFocused).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isFocused)
@@ -58,7 +73,7 @@ class ElementStateManagerTest {
     }
 
     @Test
-    fun testChangeFocus() {
+    fun testChangeFocusPIN() {
         val manager = PinElementStateManager.forEmptyInput()
         var state = manager.getState()
 
@@ -90,4 +105,38 @@ class ElementStateManagerTest {
         // is unique to PinDetails because it's an alias for `Nothing?`
         assertThat(state.details as Any?).isEqualTo(INITIAL_PIN_ELEMENT_STATE.details)
     }
+
+    @Test
+    fun testChangeFocusPAN() {
+        val manager = PanElementStateManager.forEmptyInput()
+        var state = manager.getState()
+
+        // focus
+
+        // only focus and blur should change
+        manager.changeFocus(true)
+        state = manager.getState()
+        assertThat(state.isFocused).isTrue
+        assertThat(state.isBlurred).isFalse
+        assertThat(state.isEmpty).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isEmpty)
+        assertThat(state.isValid).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isValid)
+        assertThat(state.isComplete).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isComplete)
+
+        // cast to Any? to avoid ambiguous overload issue that
+        // is unique to PinDetails because it's an alias for `Nothing?`
+        assertThat(state.details as Any?).isEqualTo(INITIAL_PAN_ELEMENT_STATE.details)
+
+        // unfocus
+        manager.changeFocus(false)
+        state = manager.getState()
+        assertThat(state.isFocused).isFalse
+        assertThat(state.isBlurred).isTrue
+        assertThat(state.isEmpty).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isEmpty)
+        assertThat(state.isValid).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isValid)
+        assertThat(state.isComplete).isEqualTo(INITIAL_PAN_ELEMENT_STATE.isComplete)
+
+        // cast to Any? to avoid ambiguous overload issue that
+        // is unique to PinDetails because it's an alias for `Nothing?`
+        assertThat(state.details as Any?).isEqualTo(INITIAL_PAN_ELEMENT_STATE.details)
+    }
 }