diff --git a/SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp b/SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp
index 8f57212bcc..d7b3a8a092 100644
--- a/SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp
@@ -132,14 +132,17 @@ class Test_AdvanceWhiteDialogDetector : public UnitTest{
 
     Test_AdvanceWhiteDialogDetector(
         const std::string& image,
-        bool expected
+        bool expected,
+        GameSettings::Device device = GameSettings::Device::switch_1_2
     )
         : UnitTest("PokemonFRLG::AdvanceWhiteDialogDetector - " + image)
         , m_image(UNIT_TEST_RESOURCE_PATH() + image)
         , m_expected(expected)
+        , m_device(device)
     {}
 
     virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        GameSettings::instance().DEVICE.set(m_device);
         AdvanceWhiteDialogDetector detector(COLOR_RED);
         ImageRGB32 image(m_image);
         return detector.detect(image) == m_expected;
@@ -148,6 +151,7 @@ class Test_AdvanceWhiteDialogDetector : public UnitTest{
 private:
     std::string m_image;
     bool m_expected;
+    GameSettings::Device m_device;
 };
 
 void add_tests_AdvanceWhiteDialogDetector(UnitTestDatabase& database){
@@ -168,14 +172,17 @@ class Test_SelectionDialogDetector : public UnitTest{
 
     Test_SelectionDialogDetector(
         const std::string& image,
-        bool expected
+        bool expected,
+        GameSettings::Device device = GameSettings::Device::switch_1_2
     )
         : UnitTest("PokemonFRLG::SelectionDialogDetector - " + image)
         , m_image(UNIT_TEST_RESOURCE_PATH() + image)
         , m_expected(expected)
+        , m_device(device)
     {}
 
     virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        GameSettings::instance().DEVICE.set(m_device);
         SelectionDialogDetector detector(COLOR_RED);
         ImageRGB32 image(m_image);
         return detector.detect(image) == m_expected;
@@ -184,6 +191,7 @@ class Test_SelectionDialogDetector : public UnitTest{
 private:
     std::string m_image;
     bool m_expected;
+    GameSettings::Device m_device;
 };
 
 void add_tests_SelectionDialogDetector(UnitTestDatabase& database){
diff --git a/SerialPrograms/Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp b/SerialPrograms/Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp
index 2b165dda84..ddacd5322f 100644
--- a/SerialPrograms/Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp
@@ -65,14 +65,17 @@ class Test_ShinySymbolDetector : public UnitTest{
 
     Test_ShinySymbolDetector(
         const std::string& image,
-        bool expected
+        bool expected,
+        GameSettings::Device device = GameSettings::Device::switch_1_2
     )
-        : UnitTest("PokemonHome::ShinySymbolDetector - " + image)
+        : UnitTest("PokemonFRLG::ShinySymbolDetector - " + image)
         , m_image(UNIT_TEST_RESOURCE_PATH() + image)
         , m_expected(expected)
+        , m_device(device)
     {}
 
     virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        GameSettings::instance().DEVICE.set(m_device);
         ShinySymbolDetector detector(COLOR_RED);
         ImageRGB32 image(m_image);
         return detector.read(logger, image) == m_expected;
@@ -81,12 +84,14 @@ class Test_ShinySymbolDetector : public UnitTest{
 private:
     std::string m_image;
     bool m_expected;
+    GameSettings::Device m_device;
 };
 
 void add_tests_ShinySymbolDetector(UnitTestDatabase& database){
     database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Char_False.png", false);
     database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Karp-coloredited_True.png", true);
     database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Karp-snotyak_True.png", true);
+    database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Carerpie-Emulator-True.png", true, GameSettings::Device::dev_test);
 }
 
 }
diff --git a/SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Settings.cpp b/SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Settings.cpp
index c1f99edd8e..27a6e03b2f 100644
--- a/SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Settings.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Settings.cpp
@@ -36,7 +36,7 @@ GameSettings::GameSettings()
         "Refer to the documentation for specific setups.",
         {
             {Device::switch_1_2,            "switch_1_2",           "Nintendo Switch 1 and 2"},
-            //{Device::dev_test,              "dev_test",             "dev test rg35xx"},
+            {Device::dev_test,              "dev_test",             "dev test rg35xx", false},
             //{Device::custom,                "custom",               "Custom"},
         },
         LockMode::LOCK_WHILE_RUNNING,