diff --git a/samples/button_event.py b/samples/button_event.py
index 4841ccd..6d32f77 100755
--- a/samples/button_event.py
+++ b/samples/button_event.py
@@ -31,7 +31,7 @@
 import time
 
 # Pin Definitons:
-led_pin = 12  # Board pin 12
+led_pin = 11  # Board pin 12
 but_pin = 18  # Board pin 18
 
 
diff --git a/samples/button_interrupt.py b/samples/button_interrupt.py
index 7450e00..d7e5102 100755
--- a/samples/button_interrupt.py
+++ b/samples/button_interrupt.py
@@ -24,7 +24,7 @@
 import time
 
 # Pin Definitions:
-led_pin_1 = 12
+led_pin_1 = 11
 led_pin_2 = 13
 but_pin = 18
 
diff --git a/samples/button_led.py b/samples/button_led.py
index e77c763..fb266f2 100755
--- a/samples/button_led.py
+++ b/samples/button_led.py
@@ -24,7 +24,7 @@
 import time
 
 # Pin Definitons:
-led_pin = 12  # BOARD pin 12
+led_pin = 11  # BOARD pin 12
 but_pin = 18  # BOARD pin 18
 
 
diff --git a/samples/simple_out.py b/samples/simple_out.py
index ad66533..6ee3d31 100755
--- a/samples/simple_out.py
+++ b/samples/simple_out.py
@@ -29,7 +29,7 @@
 
 def main():
     # Pin Setup:
-    GPIO.setmode(GPIO.BCM)  # BCM pin-numbering scheme from Raspberry Pi
+    GPIO.setmode(GPIO.BOARD)  # BCM pin-numbering scheme from Raspberry Pi
     # set pin as an output pin with optional initial state of HIGH
     GPIO.setup(output_pin, GPIO.OUT, initial=GPIO.HIGH)
 
diff --git a/samples/test_all_pins.py b/samples/test_all_pins.py
index 5d42e6e..ca3c470 100755
--- a/samples/test_all_pins.py
+++ b/samples/test_all_pins.py
@@ -43,7 +43,7 @@
         "hw_pwm": (32, 33, 36),  # HW PWMs to skip for this test
     },
     "AM62A_SK": {
-        "unimplemented": (7, 8, 10, 11, 19, 21, 23, 24, 26, 38, 40),
+        "unimplemented": (7,),
         "input_only": (),
         "hw_pwm": (12, 33, 35, 36),  # HW PWMs to skip for this test
     },
diff --git a/samples/test_all_pins_input.py b/samples/test_all_pins_input.py
index 790ea97..f6fe9d6 100755
--- a/samples/test_all_pins_input.py
+++ b/samples/test_all_pins_input.py
@@ -80,15 +80,27 @@
 
 am62a_sk_pin_defs = [
     # BOARD BCM SOC
+    # (7, 4, "GPIO1_30"),
+    (8, 14, "GPIO1_25"),
+    (10, 15, "GPIO1_24"),
+    # (11, 17, "GPIO1_11"),
+    # (12, 18, "GPIO1_14"),
     (13, 27, "GPIO0_42"),
     (15, 22, "GPIO1_22"),
     (16, 23, "GPIO0_38"),
     (18, 24, "GPIO0_39"),
+    (19, 10, "GPIO1_18"),
+    (21, 9, "GPIO1_19"),
     # (22, 25, "GPIO0_14"),
+    (23, 11, "GPIO1_17"),
+    # (24, 8, "GPIO1_15"),
+    # (26, 7, "GPIO1_16"),
     (29, 5, "GPIO0_36"),
     (31, 6, "GPIO0_33"),
     (32, 12, "GPIO0_40"),
     (37, 26, "GPIO0_41"),
+    (38, 20, "GPIO1_08"),
+    (40, 21, "GPIO1_07"),
 ]
 
 am62p_sk_pin_defs = [
diff --git a/samples/test_all_pins_pwm.py b/samples/test_all_pins_pwm.py
index f73e6d2..bf1701d 100755
--- a/samples/test_all_pins_pwm.py
+++ b/samples/test_all_pins_pwm.py
@@ -37,7 +37,28 @@
         "hw_pwm": [32, 33, 36],  # Designated HW PWM pins
     },
     "AM62A_SK": {
-        "sw_pwm": [13, 15, 16, 18, 22, 29, 31, 32, 37],  # Can be any valid GPIO pins
+        "sw_pwm": [
+            8,
+            10,
+            11,
+            12,
+            13,
+            15,
+            16,
+            18,
+            19,
+            21,
+            22,
+            23,
+            24,
+            26,
+            29,
+            31,
+            32,
+            37,
+            38,
+            40,
+        ],  # Can be any valid GPIO pins
         "hw_pwm": [12, 33, 35, 36],  # Designated HW PWM pins
     },
     "AM62P_SK": {