diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp
index c8ddb98f3..842312bf4 100644
--- a/radio/src/telemetry/telemetry_sensors.cpp
+++ b/radio/src/telemetry/telemetry_sensors.cpp
@@ -621,10 +621,10 @@ void TelemetrySensor::init(const char * label, uint8_t unit, uint8_t prec)
 void TelemetrySensor::init(uint16_t id)
 {
   char label[TELEM_LABEL_LEN]; // 4
-  label[0] = hex2char((id & 0x0f00) >> 8);
-  label[1] = hex2char((id & 0x00f0) >> 4);
-  label[2] = hex2char((id & 0x000f) >> 0);
-  label[3] = '\0';
+  label[0] = hex2char((id & 0xf000) >> 12);
+  label[1] = hex2char((id & 0x0f00) >> 8);
+  label[2] = hex2char((id & 0x00f0) >> 4);
+  label[3] = hex2char((id & 0x000f) >> 0);
   init(label);
 }
 
diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp
index 30e889523..6b5ff0dbc 100644
--- a/radio/src/tests/conversions.cpp
+++ b/radio/src/tests/conversions.cpp
@@ -50,18 +50,18 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_EQ(FUNC_LOGS, g_eeGeneral.customFn[0].func);
   EXPECT_EQ(20, g_eeGeneral.customFn[0].all.val);
 
-  EXPECT_STREQ("Tes", g_eeGeneral.switchNames[0]); // ZSTREQ
+  EXPECT_STRNEQ("Tes", g_eeGeneral.switchNames[0]); // ZSTREQ
   EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0));
 
-  EXPECT_STREQ("Test", g_model.header.name); // ZSTREQ
+  EXPECT_STRNEQ("Test", g_model.header.name); // ZSTREQ
   EXPECT_EQ(TMRMODE_START, g_model.timers[0].mode); // new!
   EXPECT_EQ(SWSRC_SA0, g_model.timers[0].swtch); // new!
   EXPECT_EQ(80, g_model.mixData[0].weight);
   EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0
   EXPECT_EQ(80, g_model.expoData[0].weight);
   EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]);
-  EXPECT_STREQ("Tes", g_model.gvars[0].name); // ZSTREQ
-  EXPECT_STREQ("Test", g_model.flightModeData[0].name); // ZSTREQ
+  EXPECT_STRNEQ("Tes", g_model.gvars[0].name); // ZSTREQ
+  EXPECT_STRNEQ("Test", g_model.flightModeData[0].name); // ZSTREQ
 
 #if defined(INTERNAL_MODULE_PXX2)
   EXPECT_EQ(MODULE_TYPE_ISRM_PXX2, g_model.moduleData[INTERNAL_MODULE].type);
@@ -73,13 +73,13 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type);
   EXPECT_EQ(MODULE_SUBTYPE_R9M_FCC, g_model.moduleData[EXTERNAL_MODULE].subType);
 
-  EXPECT_STREQ("Rud", g_model.inputNames[0]); // ZSTREQ
-  EXPECT_STREQ("Tes", g_model.telemetrySensors[0].label); // ZSTREQ
+  EXPECT_STRNEQ("Rud", g_model.inputNames[0]); // ZSTREQ
+  EXPECT_STRNEQ("Tes", g_model.telemetrySensors[0].label); // ZSTREQ
   EXPECT_EQ(10, g_model.telemetrySensors[0].id);
   EXPECT_EQ(10, g_model.telemetrySensors[0].frskyInstance.physID);
   EXPECT_EQ(MIXSRC_FIRST_TELEM, g_model.logicalSw[0].v1);
 
-  EXPECT_STREQ("abc.wav", g_model.customFn[1].play.name);
+  EXPECT_STRNEQ("abc.wav", g_model.customFn[1].play.name);
 }
 #endif
 
diff --git a/radio/src/tests/lua.cpp b/radio/src/tests/lua.cpp
index 9425726a9..f3535bd70 100644
--- a/radio/src/tests/lua.cpp
+++ b/radio/src/tests/lua.cpp
@@ -47,12 +47,12 @@ TEST(Lua, testSetModelInfo)
   luaExecStr("info.name = 'modelA'");
   luaExecStr("model.setInfo(info)");
   // luaExecStr("print('model name: '..info.name..' id: '..info.id)");
-  EXPECT_ZSTREQ("modelA", g_model.header.name);
+  EXPECT_STRNEQ("modelA", g_model.header.name);
 
   luaExecStr("info.name = 'Model 1'");
   luaExecStr("model.setInfo(info)");
   // luaExecStr("print('model name: '..info.name..' id: '..info.id)");
-  EXPECT_ZSTREQ("Model 1", g_model.header.name);
+  EXPECT_STRNEQ("Model 1", g_model.header.name);
 }
 
 TEST(Lua, testPanicProtection)