diff --git a/examples/GPS_SoftwareSerial_EchoTest/.due.test.skip b/examples/GPS_SoftwareSerial_EchoTest/.leonardo.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_EchoTest/.due.test.skip
rename to examples/GPS_SoftwareSerial_EchoTest/.leonardo.test.only
diff --git a/examples/GPS_SoftwareSerial_EchoTest/.esp32.test.skip b/examples/GPS_SoftwareSerial_EchoTest/.mega2560.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_EchoTest/.esp32.test.skip
rename to examples/GPS_SoftwareSerial_EchoTest/.mega2560.test.only
diff --git a/examples/GPS_SoftwareSerial_EchoTest/.m4.test.skip b/examples/GPS_SoftwareSerial_EchoTest/.uno.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_EchoTest/.m4.test.skip
rename to examples/GPS_SoftwareSerial_EchoTest/.uno.test.only
diff --git a/examples/GPS_SoftwareSerial_EchoTest/.zero.test.skip b/examples/GPS_SoftwareSerial_LOCUS_DumpBasic/.leonardo.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_EchoTest/.zero.test.skip
rename to examples/GPS_SoftwareSerial_LOCUS_DumpBasic/.leonardo.test.only
diff --git a/examples/GPS_SoftwareSerial_Parsing/.due.test.skip b/examples/GPS_SoftwareSerial_LOCUS_DumpBasic/.mega2560.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_Parsing/.due.test.skip
rename to examples/GPS_SoftwareSerial_LOCUS_DumpBasic/.mega2560.test.only
diff --git a/examples/GPS_SoftwareSerial_Parsing/.esp32.test.skip b/examples/GPS_SoftwareSerial_LOCUS_Erase/.leonardo.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_Parsing/.esp32.test.skip
rename to examples/GPS_SoftwareSerial_LOCUS_Erase/.leonardo.test.only
diff --git a/examples/GPS_SoftwareSerial_Parsing/.m4.test.skip b/examples/GPS_SoftwareSerial_LOCUS_Erase/.mega2560.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_Parsing/.m4.test.skip
rename to examples/GPS_SoftwareSerial_LOCUS_Erase/.mega2560.test.only
diff --git a/examples/GPS_SoftwareSerial_Parsing/.zero.test.skip b/examples/GPS_SoftwareSerial_LOCUS_Start/.leonardo.test.only
similarity index 100%
rename from examples/GPS_SoftwareSerial_Parsing/.zero.test.skip
rename to examples/GPS_SoftwareSerial_LOCUS_Start/.leonardo.test.only
diff --git a/examples/GPS_SoftwareSerial_LOCUS_Start/.mega2560.test.only b/examples/GPS_SoftwareSerial_LOCUS_Start/.mega2560.test.only
new file mode 100644
index 0000000..e69de29
diff --git a/examples/GPS_SoftwareSerial_LOCUS_Status/.leonardo.test.only b/examples/GPS_SoftwareSerial_LOCUS_Status/.leonardo.test.only
new file mode 100644
index 0000000..e69de29
diff --git a/examples/GPS_SoftwareSerial_LOCUS_Status/.mega2560.test.only b/examples/GPS_SoftwareSerial_LOCUS_Status/.mega2560.test.only
new file mode 100644
index 0000000..e69de29
diff --git a/examples/GPS_SoftwareSerial_Parsing/.leonardo.test.only b/examples/GPS_SoftwareSerial_Parsing/.leonardo.test.only
new file mode 100644
index 0000000..e69de29
diff --git a/examples/GPS_SoftwareSerial_Parsing/.mega2560.test.only b/examples/GPS_SoftwareSerial_Parsing/.mega2560.test.only
new file mode 100644
index 0000000..e69de29
diff --git a/examples/GPS_SoftwareSerial_Parsing/.uno.test.only b/examples/GPS_SoftwareSerial_Parsing/.uno.test.only
new file mode 100644
index 0000000..e69de29