diff --git a/TinyPod/code.py b/BLE_Apple_Watch_Controller/code.py
similarity index 100%
rename from TinyPod/code.py
rename to BLE_Apple_Watch_Controller/code.py
diff --git a/Factory_Tests/Metro_ESP32S2_FactoryTest/.feather_esp32s2.test.only b/Factory_Tests/Metro_ESP32S2_FactoryTest/.feather_esp32s2.test.only
new file mode 100644
index 000000000..e69de29bb
diff --git a/Factory_Tests/Metro_ESP32S2_FactoryTest/Metro_ESP32S2_FactoryTest.ino b/Factory_Tests/Metro_ESP32S2_FactoryTest/Metro_ESP32S2_FactoryTest.ino
new file mode 100644
index 000000000..fd9555a49
--- /dev/null
+++ b/Factory_Tests/Metro_ESP32S2_FactoryTest/Metro_ESP32S2_FactoryTest.ino
@@ -0,0 +1,33 @@
+// SPDX-FileCopyrightText: 2022 Limor Fried for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include <Arduino.h>
+#include <Adafruit_NeoPixel.h>
+#include "Adafruit_TestBed.h"
+
+extern Adafruit_TestBed TB;
+
+void setup() {
+  Serial.begin(115200);
+  // while (! Serial) delay(10);
+  
+  delay(100);
+  
+  TB.neopixelPin = PIN_NEOPIXEL;
+  TB.neopixelNum = 1; 
+  TB.begin();
+  TB.setColor(WHITE);
+}
+
+uint8_t j = 0;
+
+void loop() {
+
+  if (j % 10 == 0) {
+    TB.printI2CBusScan();
+  }
+  TB.setColor(TB.Wheel(j++));
+  delay(100);
+  return;
+}