diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.cpp b/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.cpp
index 953a510b..b72bfe47 100644
--- a/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.cpp
+++ b/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.cpp
@@ -1,5 +1,3 @@
-#ifdef PLATFORMIO
-
 #include "NotecardBinary.h"
 
 Notecard notecard;
@@ -14,4 +12,4 @@ BufferBinaryGenerator small_image(small_binary);
 // ensure the virtual destructor is defined.
 BinaryGenerator::~BinaryGenerator() {}
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.h b/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.h
index 66b0f57b..dc2b6ba4 100644
--- a/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.h
+++ b/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 
@@ -1185,4 +1184,4 @@ class NoteAddHandler : public FileHandler
 extern BinaryImage small_binary;
 extern BufferBinaryGenerator small_image;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardComms.cpp b/test/hitl/card.binary/lib/notecard_binary/NotecardComms.cpp
index 44b2536f..83db95e5 100644
--- a/test/hitl/card.binary/lib/notecard_binary/NotecardComms.cpp
+++ b/test/hitl/card.binary/lib/notecard_binary/NotecardComms.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardComms.h"
 #include <Arduino.h>
@@ -144,4 +143,4 @@ size_t readDataUntilTimeout(Stream& serial, size_t timeout, uint8_t* buf, size_t
 HardwareSerial Serial2(A0,A3);
 HardwareSerial Serial3(A5,A4); // A5 is RX, A4 is TX
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardComms.h b/test/hitl/card.binary/lib/notecard_binary/NotecardComms.h
index 23099e66..0765fa74 100644
--- a/test/hitl/card.binary/lib/notecard_binary/NotecardComms.h
+++ b/test/hitl/card.binary/lib/notecard_binary/NotecardComms.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 
@@ -48,4 +47,4 @@ bool set_aux_serial_baudrate(size_t baudrate=NOTECARD_IF_AUX_SERIAL_BAUDRATE, No
 
 extern Notecard notecard;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/small_img.cpp b/test/hitl/card.binary/lib/notecard_binary/small_img.cpp
index 5d5b3527..5bd1c293 100644
--- a/test/hitl/card.binary/lib/notecard_binary/small_img.cpp
+++ b/test/hitl/card.binary/lib/notecard_binary/small_img.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "small_img.h"
 
@@ -4919,4 +4918,4 @@ const uint8_t small_img_map[] = {
 };
 size_t small_img_len = 73687;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/small_img.h b/test/hitl/card.binary/lib/notecard_binary/small_img.h
index a87ac217..628a0abc 100644
--- a/test/hitl/card.binary/lib/notecard_binary/small_img.h
+++ b/test/hitl/card.binary/lib/notecard_binary/small_img.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 
@@ -8,4 +7,4 @@
 extern const uint8_t small_img_map[];
 extern size_t small_img_len;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/src/main.cpp b/test/hitl/card.binary/src/main.cpp
index 51b1a05e..fabf04a9 100644
--- a/test/hitl/card.binary/src/main.cpp
+++ b/test/hitl/card.binary/src/main.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardBinary.h"
 
@@ -17,4 +16,4 @@ void loop()
 
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_binary_generators.cpp b/test/hitl/card.binary/test/test_binary_generators.cpp
index 82b68828..d1cf036a 100644
--- a/test/hitl/card.binary/test/test_binary_generators.cpp
+++ b/test/hitl/card.binary/test/test_binary_generators.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardBinary.h"
 #include <Arduino.h>
@@ -89,4 +88,4 @@ void testsuite_binary_generators()
     RUN_TEST(test_random_generator);
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_binary_generators.h b/test/hitl/card.binary/test/test_binary_generators.h
index b9a43a98..9c4f592f 100644
--- a/test/hitl/card.binary/test/test_binary_generators.h
+++ b/test/hitl/card.binary/test/test_binary_generators.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 #include "NotecardBinary.h"
@@ -60,4 +59,4 @@ struct BuildRandom {
     }
 };
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_card_binary.cpp b/test/hitl/card.binary/test/test_card_binary.cpp
index 9da3cc0f..2a3fc960 100644
--- a/test/hitl/card.binary/test/test_card_binary.cpp
+++ b/test/hitl/card.binary/test/test_card_binary.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardBinary.h"
 #include "NotecardComms.h"
@@ -473,4 +472,4 @@ void testsuite_card_binary()
     RUN_FILTER(test_max_length_serial);
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_card_binary.h b/test/hitl/card.binary/test/test_card_binary.h
index e7a27aeb..fb5d95e6 100644
--- a/test/hitl/card.binary/test/test_card_binary.h
+++ b/test/hitl/card.binary/test/test_card_binary.h
@@ -1,5 +1,4 @@
-#ifdef PLATFORMIO
 
 void testsuite_card_binary();
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_main.cpp b/test/hitl/card.binary/test/test_main.cpp
index 03d4cc55..f003538f 100644
--- a/test/hitl/card.binary/test/test_main.cpp
+++ b/test/hitl/card.binary/test/test_main.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "test_card_binary.h"
 #include "test_binary_generators.h"
@@ -37,4 +36,4 @@ void loop()
 //  #error serial buffer is too small
 // #endif
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_unity_util.cpp b/test/hitl/card.binary/test/test_unity_util.cpp
index ddda3341..145ea8c2 100644
--- a/test/hitl/card.binary/test/test_unity_util.cpp
+++ b/test/hitl/card.binary/test/test_unity_util.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "test_unity_util.h"
 #include <string.h>
@@ -35,4 +34,4 @@ bool filterTest(const char* name)
     return true;
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_unity_util.h b/test/hitl/card.binary/test/test_unity_util.h
index 9355b1d6..d547a062 100644
--- a/test/hitl/card.binary/test/test_unity_util.h
+++ b/test/hitl/card.binary/test/test_unity_util.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 // This also needs to be added to build_flags in platformio.ini
 #ifndef UNITY_INCLUDE_PRINT_FORMATTED
@@ -32,4 +31,4 @@ extern bool filterTest(const char* name);
         RUN_TEST(func); \
     }
 
-#endif // PLATFORMIO
+
diff --git a/test/src/JAddBinaryToObject_test.cpp b/test/src/JAddBinaryToObject_test.cpp
index 4b4c7491..a756233e 100644
--- a/test/src/JAddBinaryToObject_test.cpp
+++ b/test/src/JAddBinaryToObject_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -83,4 +83,4 @@ SCENARIO("JAddBinaryToObject")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JAllocString_test.cpp b/test/src/JAllocString_test.cpp
index b7b05778..cf500492 100644
--- a/test/src/JAllocString_test.cpp
+++ b/test/src/JAllocString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -59,4 +59,4 @@ SCENARIO("JAllocString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JAtoI_test.cpp b/test/src/JAtoI_test.cpp
index b53fa610..4969e7ce 100644
--- a/test/src/JAtoI_test.cpp
+++ b/test/src/JAtoI_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -58,4 +58,4 @@ SCENARIO("JAtoI")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JBoolValue_test.cpp b/test/src/JBoolValue_test.cpp
index 8c40b49f..1c2f1f71 100644
--- a/test/src/JBoolValue_test.cpp
+++ b/test/src/JBoolValue_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -50,4 +50,4 @@ SCENARIO("JBoolValue")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JContainsString_test.cpp b/test/src/JContainsString_test.cpp
index 775402c4..9e0b31a4 100644
--- a/test/src/JContainsString_test.cpp
+++ b/test/src/JContainsString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -68,4 +68,4 @@ SCENARIO("JContainsString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetArray_test.cpp b/test/src/JGetArray_test.cpp
index a2a50b38..1328816c 100644
--- a/test/src/JGetArray_test.cpp
+++ b/test/src/JGetArray_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetArray")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetBinaryFromObject_test.cpp b/test/src/JGetBinaryFromObject_test.cpp
index 40c6df77..be908e80 100644
--- a/test/src/JGetBinaryFromObject_test.cpp
+++ b/test/src/JGetBinaryFromObject_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -80,4 +80,4 @@ SCENARIO("JGetBinaryFromObject")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetBool_test.cpp b/test/src/JGetBool_test.cpp
index 896aa797..c4174c25 100644
--- a/test/src/JGetBool_test.cpp
+++ b/test/src/JGetBool_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetBool")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetInt_test.cpp b/test/src/JGetInt_test.cpp
index 8f481c61..20b16764 100644
--- a/test/src/JGetInt_test.cpp
+++ b/test/src/JGetInt_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetInt")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetItemName_test.cpp b/test/src/JGetItemName_test.cpp
index 0b608c8b..dc8712f2 100644
--- a/test/src/JGetItemName_test.cpp
+++ b/test/src/JGetItemName_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -47,4 +47,4 @@ SCENARIO("JGetItemName")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetNumber_test.cpp b/test/src/JGetNumber_test.cpp
index 04a4fd72..7e6e3a76 100644
--- a/test/src/JGetNumber_test.cpp
+++ b/test/src/JGetNumber_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetNumber")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetObject_test.cpp b/test/src/JGetObject_test.cpp
index f8e274d2..cf022d28 100644
--- a/test/src/JGetObject_test.cpp
+++ b/test/src/JGetObject_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetObject")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetString_test.cpp b/test/src/JGetString_test.cpp
index 7cc4aa43..5aada58e 100644
--- a/test/src/JGetString_test.cpp
+++ b/test/src/JGetString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -66,4 +66,4 @@ SCENARIO("JGetString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetType_test.cpp b/test/src/JGetType_test.cpp
index b32c3711..2ecbed6f 100644
--- a/test/src/JGetType_test.cpp
+++ b/test/src/JGetType_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -158,4 +158,4 @@ SCENARIO("JGetType")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JIntValue_test.cpp b/test/src/JIntValue_test.cpp
index 3867df93..fa2e8f6e 100644
--- a/test/src/JIntValue_test.cpp
+++ b/test/src/JIntValue_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -46,4 +46,4 @@ SCENARIO("JIntValue")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JIsExactString_test.cpp b/test/src/JIsExactString_test.cpp
index 5ddbea4e..3b8cc6dc 100644
--- a/test/src/JIsExactString_test.cpp
+++ b/test/src/JIsExactString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -71,4 +71,4 @@ SCENARIO("JIsExactString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JIsNullString_test.cpp b/test/src/JIsNullString_test.cpp
index 20051a08..ff1ea9e4 100644
--- a/test/src/JIsNullString_test.cpp
+++ b/test/src/JIsNullString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -61,4 +61,4 @@ SCENARIO("JIsNullString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JIsPresent_test.cpp b/test/src/JIsPresent_test.cpp
index 91533c5b..dd7b93f1 100644
--- a/test/src/JIsPresent_test.cpp
+++ b/test/src/JIsPresent_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -50,4 +50,4 @@ SCENARIO("JIsPresent")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JItoA_test.cpp b/test/src/JItoA_test.cpp
index 5aca8eb4..6b066ef0 100644
--- a/test/src/JItoA_test.cpp
+++ b/test/src/JItoA_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -45,4 +45,4 @@ SCENARIO("JItoA")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JNumberValue_test.cpp b/test/src/JNumberValue_test.cpp
index fb5629f1..9a57e5b6 100644
--- a/test/src/JNumberValue_test.cpp
+++ b/test/src/JNumberValue_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -46,4 +46,4 @@ SCENARIO("JNumberValue")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JPrintUnformatted_test.cpp b/test/src/JPrintUnformatted_test.cpp
index 66ac45b3..981fb53e 100644
--- a/test/src/JPrintUnformatted_test.cpp
+++ b/test/src/JPrintUnformatted_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -63,4 +63,4 @@ SCENARIO("JPrintUnformatted")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JStringValue_test.cpp b/test/src/JStringValue_test.cpp
index 644ab5c7..084054ab 100644
--- a/test/src/JStringValue_test.cpp
+++ b/test/src/JStringValue_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -46,4 +46,4 @@ SCENARIO("JStringValue")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JType_test.cpp b/test/src/JType_test.cpp
index 0b149eaa..9ed51353 100644
--- a/test/src/JType_test.cpp
+++ b/test/src/JType_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -64,4 +64,4 @@ SCENARIO("JType")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/Jtolower_test.cpp b/test/src/Jtolower_test.cpp
index 26386944..6707422f 100644
--- a/test/src/Jtolower_test.cpp
+++ b/test/src/Jtolower_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -70,4 +70,4 @@ SCENARIO("Jtolower")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteAdd_test.cpp b/test/src/NoteAdd_test.cpp
index 8e40b5cf..e54575e0 100644
--- a/test/src/NoteAdd_test.cpp
+++ b/test/src/NoteAdd_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -72,4 +72,4 @@ SCENARIO("NoteAdd")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryCodecDecode_test.cpp b/test/src/NoteBinaryCodecDecode_test.cpp
index 0ac45446..78a79cfe 100644
--- a/test/src/NoteBinaryCodecDecode_test.cpp
+++ b/test/src/NoteBinaryCodecDecode_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -88,4 +88,4 @@ SCENARIO("NoteBinaryCodecDecode")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryCodecEncode_test.cpp b/test/src/NoteBinaryCodecEncode_test.cpp
index 77eb3d66..595855e3 100644
--- a/test/src/NoteBinaryCodecEncode_test.cpp
+++ b/test/src/NoteBinaryCodecEncode_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <string.h>
 
@@ -89,4 +89,4 @@ SCENARIO("NoteBinaryCodecEncode")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryCodecMaxDecodedLength_test.cpp b/test/src/NoteBinaryCodecMaxDecodedLength_test.cpp
index 3f2470f6..e59fc23b 100644
--- a/test/src/NoteBinaryCodecMaxDecodedLength_test.cpp
+++ b/test/src/NoteBinaryCodecMaxDecodedLength_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -53,4 +53,4 @@ SCENARIO("NoteBinaryCodecMaxDecodedLength")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryCodecMaxEncodedLength_test.cpp b/test/src/NoteBinaryCodecMaxEncodedLength_test.cpp
index b94eee0b..76089384 100644
--- a/test/src/NoteBinaryCodecMaxEncodedLength_test.cpp
+++ b/test/src/NoteBinaryCodecMaxEncodedLength_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -53,4 +53,4 @@ SCENARIO("NoteBinaryCodecMaxEncodedLength")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryStoreDecodedLength_test.cpp b/test/src/NoteBinaryStoreDecodedLength_test.cpp
index b27c4374..2a7757eb 100644
--- a/test/src/NoteBinaryStoreDecodedLength_test.cpp
+++ b/test/src/NoteBinaryStoreDecodedLength_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -132,4 +132,4 @@ SCENARIO("NoteBinaryStoreDecodedLength")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryStoreEncodedLength_test.cpp b/test/src/NoteBinaryStoreEncodedLength_test.cpp
index c28a8460..7b24ad37 100644
--- a/test/src/NoteBinaryStoreEncodedLength_test.cpp
+++ b/test/src/NoteBinaryStoreEncodedLength_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -130,4 +130,4 @@ SCENARIO("NoteBinaryStoreEncodedLength")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryStoreReceive_test.cpp b/test/src/NoteBinaryStoreReceive_test.cpp
index cf75b505..ef31f1a6 100644
--- a/test/src/NoteBinaryStoreReceive_test.cpp
+++ b/test/src/NoteBinaryStoreReceive_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -242,4 +242,4 @@ SCENARIO("NoteBinaryStoreReceive")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryStoreReset_test.cpp b/test/src/NoteBinaryStoreReset_test.cpp
index 3f8a3617..9164cc74 100644
--- a/test/src/NoteBinaryStoreReset_test.cpp
+++ b/test/src/NoteBinaryStoreReset_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -84,4 +84,4 @@ SCENARIO("NoteBinaryStoreReset")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteBinaryStoreTransmit_test.cpp b/test/src/NoteBinaryStoreTransmit_test.cpp
index 7c7c53b2..5de140b4 100644
--- a/test/src/NoteBinaryStoreTransmit_test.cpp
+++ b/test/src/NoteBinaryStoreTransmit_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -404,4 +404,4 @@ SCENARIO("NoteBinaryStoreTransmit")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteClearLocation_test.cpp b/test/src/NoteClearLocation_test.cpp
index 12fa8337..ffbe9247 100644
--- a/test/src/NoteClearLocation_test.cpp
+++ b/test/src/NoteClearLocation_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -62,4 +62,4 @@ SCENARIO("NoteClearLocation")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteDebugSyncStatus_test.cpp b/test/src/NoteDebugSyncStatus_test.cpp
index 680352ad..a0549479 100644
--- a/test/src/NoteDebugSyncStatus_test.cpp
+++ b/test/src/NoteDebugSyncStatus_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -167,4 +167,4 @@ SCENARIO("NoteDebugSyncStatus")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteDebug_test.cpp b/test/src/NoteDebug_test.cpp
index ff85f374..377dc23d 100644
--- a/test/src/NoteDebug_test.cpp
+++ b/test/src/NoteDebug_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -124,4 +124,4 @@ SCENARIO("NoteDebug")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteDebugf_test.cpp b/test/src/NoteDebugf_test.cpp
index cc2d628b..50e7f40c 100644
--- a/test/src/NoteDebugf_test.cpp
+++ b/test/src/NoteDebugf_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -46,4 +46,4 @@ SCENARIO("NoteDebugf")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteErrorClean_test.cpp b/test/src/NoteErrorClean_test.cpp
index 735c7dbd..6a4d75f1 100644
--- a/test/src/NoteErrorClean_test.cpp
+++ b/test/src/NoteErrorClean_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -47,4 +47,4 @@ SCENARIO("NoteErrorClean")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteFactoryReset_test.cpp b/test/src/NoteFactoryReset_test.cpp
index fb424df3..bfa680c0 100644
--- a/test/src/NoteFactoryReset_test.cpp
+++ b/test/src/NoteFactoryReset_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -82,4 +82,4 @@ SCENARIO("NoteFactoryReset")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetContact_test.cpp b/test/src/NoteGetContact_test.cpp
index 57d17b47..0da8f8ca 100644
--- a/test/src/NoteGetContact_test.cpp
+++ b/test/src/NoteGetContact_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -107,4 +107,4 @@ SCENARIO("NoteGetContact")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetEnvNumber_test.cpp b/test/src/NoteGetEnvNumber_test.cpp
index 991fec8a..6ffe8c16 100644
--- a/test/src/NoteGetEnvNumber_test.cpp
+++ b/test/src/NoteGetEnvNumber_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -67,4 +67,4 @@ SCENARIO("NoteGetEnvNumber, NoteGetEnvInt")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetEnv_test.cpp b/test/src/NoteGetEnv_test.cpp
index 25695e90..c967d7d5 100644
--- a/test/src/NoteGetEnv_test.cpp
+++ b/test/src/NoteGetEnv_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -99,4 +99,4 @@ SCENARIO("NoteGetEnv")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetLocationMode_test.cpp b/test/src/NoteGetLocationMode_test.cpp
index 36c6f7b9..4f8ecd3b 100644
--- a/test/src/NoteGetLocationMode_test.cpp
+++ b/test/src/NoteGetLocationMode_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -64,4 +64,4 @@ SCENARIO("NoteGetLocationMode")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetLocation_test.cpp b/test/src/NoteGetLocation_test.cpp
index bc3e47fd..dd630186 100644
--- a/test/src/NoteGetLocation_test.cpp
+++ b/test/src/NoteGetLocation_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -69,4 +69,4 @@ SCENARIO("NoteGetLocation")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetNetStatus_test.cpp b/test/src/NoteGetNetStatus_test.cpp
index 4e93f19d..99dbd0a3 100644
--- a/test/src/NoteGetNetStatus_test.cpp
+++ b/test/src/NoteGetNetStatus_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -64,4 +64,4 @@ SCENARIO("NoteGetNetStatus")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetServiceConfig_test.cpp b/test/src/NoteGetServiceConfig_test.cpp
index 65a1c390..192e49cc 100644
--- a/test/src/NoteGetServiceConfig_test.cpp
+++ b/test/src/NoteGetServiceConfig_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -96,4 +96,4 @@ SCENARIO("NoteGetServiceConfig")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetStatus_test.cpp b/test/src/NoteGetStatus_test.cpp
index a1ed991c..1a9f29f4 100644
--- a/test/src/NoteGetStatus_test.cpp
+++ b/test/src/NoteGetStatus_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -95,4 +95,4 @@ SCENARIO("NoteGetStatus")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetTemperature_test.cpp b/test/src/NoteGetTemperature_test.cpp
index 407b7e96..aa0eee3e 100644
--- a/test/src/NoteGetTemperature_test.cpp
+++ b/test/src/NoteGetTemperature_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -78,4 +78,4 @@ SCENARIO("NoteGetTemperature")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetVersion_test.cpp b/test/src/NoteGetVersion_test.cpp
index b6579362..a79b7a3b 100644
--- a/test/src/NoteGetVersion_test.cpp
+++ b/test/src/NoteGetVersion_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -64,4 +64,4 @@ SCENARIO("NoteGetVersion")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteGetVoltage_test.cpp b/test/src/NoteGetVoltage_test.cpp
index 1b1b2580..b1447dc9 100644
--- a/test/src/NoteGetVoltage_test.cpp
+++ b/test/src/NoteGetVoltage_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -78,4 +78,4 @@ SCENARIO("NoteGetVoltage")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteIsConnected_test.cpp b/test/src/NoteIsConnected_test.cpp
index 5b560bc4..df909adc 100644
--- a/test/src/NoteIsConnected_test.cpp
+++ b/test/src/NoteIsConnected_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -66,4 +66,4 @@ SCENARIO("NoteIsConnected")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteLocalTimeST_test.cpp b/test/src/NoteLocalTimeST_test.cpp
index b74e4a32..58e7484e 100644
--- a/test/src/NoteLocalTimeST_test.cpp
+++ b/test/src/NoteLocalTimeST_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -97,4 +97,4 @@ SCENARIO("NoteLocalTimeST")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteLocationValid_test.cpp b/test/src/NoteLocationValid_test.cpp
index b95f8a17..d0e04021 100644
--- a/test/src/NoteLocationValid_test.cpp
+++ b/test/src/NoteLocationValid_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -76,4 +76,4 @@ SCENARIO("NoteLocationValid")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteNewCommand_test.cpp b/test/src/NoteNewCommand_test.cpp
index 8f7ff71e..9cbeb94d 100644
--- a/test/src/NoteNewCommand_test.cpp
+++ b/test/src/NoteNewCommand_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -53,4 +53,4 @@ SCENARIO("NoteNewCommand")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteNewRequest_test.cpp b/test/src/NoteNewRequest_test.cpp
index 6848fefb..c0a88460 100644
--- a/test/src/NoteNewRequest_test.cpp
+++ b/test/src/NoteNewRequest_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -53,4 +53,4 @@ SCENARIO("NoteNewRequest")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NotePayloadRetrieveAfterSleep_test.cpp b/test/src/NotePayloadRetrieveAfterSleep_test.cpp
index 883b63be..16639143 100644
--- a/test/src/NotePayloadRetrieveAfterSleep_test.cpp
+++ b/test/src/NotePayloadRetrieveAfterSleep_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -140,4 +140,4 @@ SCENARIO("NotePayloadRetrieveAfterSleep")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NotePayloadSaveAndSleep_test.cpp b/test/src/NotePayloadSaveAndSleep_test.cpp
index 59f62d69..1265ab37 100644
--- a/test/src/NotePayloadSaveAndSleep_test.cpp
+++ b/test/src/NotePayloadSaveAndSleep_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -73,4 +73,4 @@ SCENARIO("NotePayloadSaveAndSleep")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NotePayload_test.cpp b/test/src/NotePayload_test.cpp
index 1620d974..852b6712 100644
--- a/test/src/NotePayload_test.cpp
+++ b/test/src/NotePayload_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -142,4 +142,4 @@ SCENARIO("NotePayload")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NotePrint_test.cpp b/test/src/NotePrint_test.cpp
index 850507c0..85498ab9 100644
--- a/test/src/NotePrint_test.cpp
+++ b/test/src/NotePrint_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -83,4 +83,4 @@ SCENARIO("NotePrint")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NotePrintf_test.cpp b/test/src/NotePrintf_test.cpp
index 7add8b92..c4492905 100644
--- a/test/src/NotePrintf_test.cpp
+++ b/test/src/NotePrintf_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -50,4 +50,4 @@ SCENARIO("NotePrintf")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NotePrintln_test.cpp b/test/src/NotePrintln_test.cpp
index b0fe20d8..b9eadab9 100644
--- a/test/src/NotePrintln_test.cpp
+++ b/test/src/NotePrintln_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -55,4 +55,4 @@ SCENARIO("NotePrintln")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteRegion_test.cpp b/test/src/NoteRegion_test.cpp
index 956d778f..06b39240 100644
--- a/test/src/NoteRegion_test.cpp
+++ b/test/src/NoteRegion_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -98,4 +98,4 @@ SCENARIO("NoteRegion")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteRequestResponseJSON_test.cpp b/test/src/NoteRequestResponseJSON_test.cpp
index 6d5b1e77..defba286 100644
--- a/test/src/NoteRequestResponseJSON_test.cpp
+++ b/test/src/NoteRequestResponseJSON_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -177,4 +177,4 @@ SCENARIO("NoteRequestResponseJSON")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteRequestResponse_test.cpp b/test/src/NoteRequestResponse_test.cpp
index 8086d07d..9fafb0ee 100644
--- a/test/src/NoteRequestResponse_test.cpp
+++ b/test/src/NoteRequestResponse_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -64,4 +64,4 @@ SCENARIO("NoteRequestResponse")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteRequestWithRetry_test.cpp b/test/src/NoteRequestWithRetry_test.cpp
index 10c0f29a..c4ded82c 100644
--- a/test/src/NoteRequestWithRetry_test.cpp
+++ b/test/src/NoteRequestWithRetry_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -120,5 +120,3 @@ SCENARIO("NoteRequestWithRetry")
 }
 
 }
-
-#endif
diff --git a/test/src/NoteRequest_test.cpp b/test/src/NoteRequest_test.cpp
index bf9f9b38..57ecff4f 100644
--- a/test/src/NoteRequest_test.cpp
+++ b/test/src/NoteRequest_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -67,4 +67,4 @@ SCENARIO("NoteRequest")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteReset_test.cpp b/test/src/NoteReset_test.cpp
index 7fed0846..e7aa7f26 100644
--- a/test/src/NoteReset_test.cpp
+++ b/test/src/NoteReset_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -55,4 +55,4 @@ SCENARIO("NoteReset")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSendToRoute_test.cpp b/test/src/NoteSendToRoute_test.cpp
index 8240d831..e1d194e9 100644
--- a/test/src/NoteSendToRoute_test.cpp
+++ b/test/src/NoteSendToRoute_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -103,4 +103,4 @@ SCENARIO("NoteSendToRoute")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSerialHooks_test.cpp b/test/src/NoteSerialHooks_test.cpp
index d356574b..d6e8f95f 100644
--- a/test/src/NoteSerialHooks_test.cpp
+++ b/test/src/NoteSerialHooks_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -60,4 +60,4 @@ SCENARIO("NoteSerialHooks")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetContact_test.cpp b/test/src/NoteSetContact_test.cpp
index 06536bdd..fff913aa 100644
--- a/test/src/NoteSetContact_test.cpp
+++ b/test/src/NoteSetContact_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -72,4 +72,4 @@ SCENARIO("NoteSetContact")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetEnvDefaultNumber_test.cpp b/test/src/NoteSetEnvDefaultNumber_test.cpp
index c848907d..32d4e426 100644
--- a/test/src/NoteSetEnvDefaultNumber_test.cpp
+++ b/test/src/NoteSetEnvDefaultNumber_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -55,4 +55,4 @@ SCENARIO("NoteSetEnvDefaultNumber, NoteSetEnvDefaultInt")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetEnvDefault_test.cpp b/test/src/NoteSetEnvDefault_test.cpp
index d80428d9..48e7de30 100644
--- a/test/src/NoteSetEnvDefault_test.cpp
+++ b/test/src/NoteSetEnvDefault_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -64,4 +64,4 @@ SCENARIO("NoteSetEnvDefault")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetFnI2CMutex_test.cpp b/test/src/NoteSetFnI2CMutex_test.cpp
index 87c746e2..3d797270 100644
--- a/test/src/NoteSetFnI2CMutex_test.cpp
+++ b/test/src/NoteSetFnI2CMutex_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -55,4 +55,4 @@ SCENARIO("NoteSetFnI2CMutex")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetFnI2C_test.cpp b/test/src/NoteSetFnI2C_test.cpp
index bde9a2b5..8a95604b 100644
--- a/test/src/NoteSetFnI2C_test.cpp
+++ b/test/src/NoteSetFnI2C_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -116,4 +116,4 @@ SCENARIO("NoteSetFnI2C")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetFnMutex_test.cpp b/test/src/NoteSetFnMutex_test.cpp
index a691864a..c8ed7ac3 100644
--- a/test/src/NoteSetFnMutex_test.cpp
+++ b/test/src/NoteSetFnMutex_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -79,4 +79,4 @@ SCENARIO("NoteSetFnMutex")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetFnNoteMutex_test.cpp b/test/src/NoteSetFnNoteMutex_test.cpp
index a24328a8..c6f39bff 100644
--- a/test/src/NoteSetFnNoteMutex_test.cpp
+++ b/test/src/NoteSetFnNoteMutex_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -55,4 +55,4 @@ SCENARIO("NoteSetFnNoteMutex")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetFnSerial_test.cpp b/test/src/NoteSetFnSerial_test.cpp
index 833f217d..34b008d7 100644
--- a/test/src/NoteSetFnSerial_test.cpp
+++ b/test/src/NoteSetFnSerial_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -114,4 +114,4 @@ SCENARIO("NoteSetFnSerial")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetFn_test.cpp b/test/src/NoteSetFn_test.cpp
index 9019150f..a890a7e9 100644
--- a/test/src/NoteSetFn_test.cpp
+++ b/test/src/NoteSetFn_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -90,4 +90,4 @@ SCENARIO("NoteSetFn")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetLocationMode_test.cpp b/test/src/NoteSetLocationMode_test.cpp
index 57e02619..c324d53a 100644
--- a/test/src/NoteSetLocationMode_test.cpp
+++ b/test/src/NoteSetLocationMode_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -75,4 +75,4 @@ SCENARIO("NoteSetLocationMode")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetLocation_test.cpp b/test/src/NoteSetLocation_test.cpp
index c99fd479..f3eaa5be 100644
--- a/test/src/NoteSetLocation_test.cpp
+++ b/test/src/NoteSetLocation_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -65,4 +65,4 @@ SCENARIO("NoteSetLocation")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetProductID_test.cpp b/test/src/NoteSetProductID_test.cpp
index 4d2bd082..f1f5e0f9 100644
--- a/test/src/NoteSetProductID_test.cpp
+++ b/test/src/NoteSetProductID_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -72,4 +72,4 @@ SCENARIO("NoteSetProductID")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetSerialNumber_test.cpp b/test/src/NoteSetSerialNumber_test.cpp
index a0b50f32..f4ace94d 100644
--- a/test/src/NoteSetSerialNumber_test.cpp
+++ b/test/src/NoteSetSerialNumber_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -72,4 +72,4 @@ SCENARIO("NoteSetSerialNumber")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetSyncMode_test.cpp b/test/src/NoteSetSyncMode_test.cpp
index ac6629bb..018aa4ea 100644
--- a/test/src/NoteSetSyncMode_test.cpp
+++ b/test/src/NoteSetSyncMode_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -95,4 +95,4 @@ SCENARIO("NoteSetSyncMode")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSetUploadMode_test.cpp b/test/src/NoteSetUploadMode_test.cpp
index 49e98336..dec9233b 100644
--- a/test/src/NoteSetUploadMode_test.cpp
+++ b/test/src/NoteSetUploadMode_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -77,4 +77,4 @@ SCENARIO("NoteSetUploadMode")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteSleep_test.cpp b/test/src/NoteSleep_test.cpp
index 7a34be6f..4187a501 100644
--- a/test/src/NoteSleep_test.cpp
+++ b/test/src/NoteSleep_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -77,4 +77,4 @@ SCENARIO("NoteSleep")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteTemplate_test.cpp b/test/src/NoteTemplate_test.cpp
index f70dec2e..10b18987 100644
--- a/test/src/NoteTemplate_test.cpp
+++ b/test/src/NoteTemplate_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -65,4 +65,4 @@ SCENARIO("NoteTemplate")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteTimeSet_test.cpp b/test/src/NoteTimeSet_test.cpp
index ea53d9bd..025bcc74 100644
--- a/test/src/NoteTimeSet_test.cpp
+++ b/test/src/NoteTimeSet_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -91,4 +91,4 @@ SCENARIO("NoteTimeSet")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteTime_test.cpp b/test/src/NoteTime_test.cpp
index 54b67e1e..bf358ab9 100644
--- a/test/src/NoteTime_test.cpp
+++ b/test/src/NoteTime_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -102,4 +102,4 @@ SCENARIO("NoteTime")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteTransactionHooks_test.cpp b/test/src/NoteTransactionHooks_test.cpp
index 52b708ca..13fb3a3b 100644
--- a/test/src/NoteTransactionHooks_test.cpp
+++ b/test/src/NoteTransactionHooks_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -60,4 +60,4 @@ SCENARIO("NoteTransactionHooks")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteTransaction_test.cpp b/test/src/NoteTransaction_test.cpp
index f3d1eb89..3ea5028a 100644
--- a/test/src/NoteTransaction_test.cpp
+++ b/test/src/NoteTransaction_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -408,4 +408,4 @@ SCENARIO("NoteTransaction")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/NoteUserAgent_test.cpp b/test/src/NoteUserAgent_test.cpp
index 2addcd73..49345867 100644
--- a/test/src/NoteUserAgent_test.cpp
+++ b/test/src/NoteUserAgent_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include "n_lib.h"
 #include <catch2/catch_test_macros.hpp>
@@ -98,4 +98,3 @@ SCENARIO("NoteUserAgent")
 }
 
 #endif // !NOTE_DISABLE_USER_AGENT
-#endif // NOTE_C_TEST
diff --git a/test/src/NoteWake_test.cpp b/test/src/NoteWake_test.cpp
index d61acbfc..d890866f 100644
--- a/test/src/NoteWake_test.cpp
+++ b/test/src/NoteWake_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -76,4 +76,4 @@ SCENARIO("NoteWake")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/crcAdd_test.cpp b/test/src/crcAdd_test.cpp
index be6410cd..1a33c256 100644
--- a/test/src/crcAdd_test.cpp
+++ b/test/src/crcAdd_test.cpp
@@ -11,7 +11,6 @@
  *
  */
 
-#ifdef NOTE_C_TEST
 #ifndef NOTE_LOWMEM
 
 #include <catch2/catch_test_macros.hpp>
@@ -70,4 +69,3 @@ SCENARIO("crcAdd")
 }
 
 #endif // !NOTE_LOWMEM
-#endif // NOTE_C_TEST
diff --git a/test/src/crcError_test.cpp b/test/src/crcError_test.cpp
index 529622f4..34ec44e5 100644
--- a/test/src/crcError_test.cpp
+++ b/test/src/crcError_test.cpp
@@ -11,7 +11,6 @@
  *
  */
 
-#ifdef NOTE_C_TEST
 #ifndef NOTE_LOWMEM
 
 #include <catch2/catch_test_macros.hpp>
@@ -87,4 +86,3 @@ SCENARIO("crcError")
 }
 
 #endif // !NOTE_LOWMEM
-#endif // NOTE_C_TEST
diff --git a/test/src/i2cChunkedReceive_test.cpp b/test/src/i2cChunkedReceive_test.cpp
index 29ce3937..ab804f0c 100644
--- a/test/src/i2cChunkedReceive_test.cpp
+++ b/test/src/i2cChunkedReceive_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -415,4 +415,4 @@ SCENARIO("i2cChunkedReceive")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/i2cChunkedTransmit_test.cpp b/test/src/i2cChunkedTransmit_test.cpp
index c3247b2c..e349b8dc 100644
--- a/test/src/i2cChunkedTransmit_test.cpp
+++ b/test/src/i2cChunkedTransmit_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -142,4 +142,4 @@ SCENARIO("i2cChunkedTransmit")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/i2cNoteQueryLength_test.cpp b/test/src/i2cNoteQueryLength_test.cpp
index 99fb1bd7..ba4c1308 100644
--- a/test/src/i2cNoteQueryLength_test.cpp
+++ b/test/src/i2cNoteQueryLength_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -149,4 +149,4 @@ SCENARIO("i2cNoteQueryLength")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/i2cNoteReset_test.cpp b/test/src/i2cNoteReset_test.cpp
index 223fc007..aa4710b5 100644
--- a/test/src/i2cNoteReset_test.cpp
+++ b/test/src/i2cNoteReset_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -506,4 +506,4 @@ SCENARIO("i2cNoteReset")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/i2cNoteTransaction_test.cpp b/test/src/i2cNoteTransaction_test.cpp
index 37f9ab8f..a0b102e3 100644
--- a/test/src/i2cNoteTransaction_test.cpp
+++ b/test/src/i2cNoteTransaction_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -260,4 +260,4 @@ SCENARIO("i2cNoteTransaction")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/serialChunkedReceive_test.cpp b/test/src/serialChunkedReceive_test.cpp
index 7bb4b0cb..8dad9e49 100644
--- a/test/src/serialChunkedReceive_test.cpp
+++ b/test/src/serialChunkedReceive_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -299,4 +299,4 @@ SCENARIO("serialChunkedReceive")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/serialChunkedTransmit_test.cpp b/test/src/serialChunkedTransmit_test.cpp
index a2783dcd..b0855bec 100644
--- a/test/src/serialChunkedTransmit_test.cpp
+++ b/test/src/serialChunkedTransmit_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -153,4 +153,4 @@ SCENARIO("serialChunkedTransmit")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/serialNoteReset_test.cpp b/test/src/serialNoteReset_test.cpp
index ea168dc9..af97c979 100644
--- a/test/src/serialNoteReset_test.cpp
+++ b/test/src/serialNoteReset_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -132,4 +132,4 @@ SCENARIO("serialNoteReset")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/serialNoteTransaction_test.cpp b/test/src/serialNoteTransaction_test.cpp
index e514917f..df5219e8 100644
--- a/test/src/serialNoteTransaction_test.cpp
+++ b/test/src/serialNoteTransaction_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -353,4 +353,4 @@ SCENARIO("serialNoteTransaction")
 
 }
 
-#endif // NOTE_C_TEST
+