diff --git a/hal/src/boron/pinmap_hal.c b/hal/src/boron/pinmap_hal.c
index a7e98ce5ad..e46d36a7f2 100644
--- a/hal/src/boron/pinmap_hal.c
+++ b/hal/src/boron/pinmap_hal.c
@@ -125,7 +125,7 @@ const uint8_t NRF_PIN_LOOKUP_TABLE[48] = {
 
 #if PLATFORM_ID == PLATFORM_ESOMX
 
-// H/W v0.02
+// H/W v0.02 and H/W v0.03
 static Hal_Pin_Info s_pin_map[TOTAL_PINS] = {
 /* User space */
 /* D0            - 00 */ { NRF_PORT_1,    1,           PIN_MODE_NONE, PF_NONE, ADC_CHANNEL_NONE, 1,                 0,                8, EXTI_CHANNEL_NONE, 0},
diff --git a/user/tests/wiring/no_fixture/gpio.cpp b/user/tests/wiring/no_fixture/gpio.cpp
index e36afe0f91..775b5c9640 100644
--- a/user/tests/wiring/no_fixture/gpio.cpp
+++ b/user/tests/wiring/no_fixture/gpio.cpp
@@ -175,11 +175,7 @@ test(GPIO_07_pulseIn_TimesOutAfter3Seconds) {
 }
 
 test(GPIO_08_DigitalReadWorksMixedWithAnalogRead) {
-#if PLATFORM_ID == PLATFORM_ESOMX
-    pin_t pin = A3;
-#else 
     pin_t pin = A0;
-#endif
 
     pinMode(pin, INPUT_PULLUP);
     assertEqual(hal_gpio_get_mode(pin), INPUT_PULLUP);
diff --git a/user/tests/wiring/no_fixture_long_running/pwm.cpp b/user/tests/wiring/no_fixture_long_running/pwm.cpp
index a5b46b25f8..b9c4acd52b 100644
--- a/user/tests/wiring/no_fixture_long_running/pwm.cpp
+++ b/user/tests/wiring/no_fixture_long_running/pwm.cpp
@@ -47,14 +47,14 @@ static hal_pin_t pin = pwm_pins[0].pin;
 
 template <typename F> void for_all_pwm_pins(F callback)
 {
-    // RGB.control(true);
+    RGB.control(true);
     for (uint8_t i = 0; i<arraySize(pwm_pins); i++)
     {
         callback(pwm_pins[i].pin, pwm_pins[i].name);
         // Make sure to disable PWM pins
         pinMode(pwm_pins[i].pin, INPUT);
     }
-    // RGB.control(false);
+    RGB.control(false);
 }
 
 test(PWM_01_NoAnalogWriteWhenPinModeIsNotSetToOutput) {