diff --git a/tools/test_buildA6/test_build.ino b/tools/test_buildA6/test_build.ino
index 5d29bff..0473985 100644
--- a/tools/test_buildA6/test_build.ino
+++ b/tools/test_buildA6/test_build.ino
@@ -33,11 +33,13 @@ void loop() {
   modem.factoryDefault();
 
   // Test the SIM card functions
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) || defined(TINY_GSM_MODEM_XBEE)
   modem.getSimCCID();
   modem.getIMEI();
   modem.getSimStatus();
   modem.getRegistrationStatus();
   modem.getOperator();
+  #endif
 
 
   // Test the Networking functions
@@ -72,6 +74,6 @@ void loop() {
   #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.gprsDisconnect();
   #else
-  networkDisconnect()
+  modem.networkDisconnect()
   #endif
 }
diff --git a/tools/test_buildESP8266/test_build.ino b/tools/test_buildESP8266/test_build.ino
index 4e470b6..ae628dd 100644
--- a/tools/test_buildESP8266/test_build.ino
+++ b/tools/test_buildESP8266/test_build.ino
@@ -33,11 +33,13 @@ void loop() {
   modem.factoryDefault();
 
   // Test the SIM card functions
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) || defined(TINY_GSM_MODEM_XBEE)
   modem.getSimCCID();
   modem.getIMEI();
   modem.getSimStatus();
   modem.getRegistrationStatus();
   modem.getOperator();
+  #endif
 
 
   // Test the Networking functions
@@ -72,6 +74,6 @@ void loop() {
   #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.gprsDisconnect();
   #else
-  networkDisconnect()
+  modem.networkDisconnect()
   #endif
 }
diff --git a/tools/test_buildM590/test_build.ino b/tools/test_buildM590/test_build.ino
index 35b0d45..4e4bea0 100644
--- a/tools/test_buildM590/test_build.ino
+++ b/tools/test_buildM590/test_build.ino
@@ -33,11 +33,13 @@ void loop() {
   modem.factoryDefault();
 
   // Test the SIM card functions
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) || defined(TINY_GSM_MODEM_XBEE)
   modem.getSimCCID();
   modem.getIMEI();
   modem.getSimStatus();
   modem.getRegistrationStatus();
   modem.getOperator();
+  #endif
 
 
   // Test the Networking functions
@@ -72,6 +74,6 @@ void loop() {
   #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.gprsDisconnect();
   #else
-  networkDisconnect()
+  modem.networkDisconnect()
   #endif
 }
diff --git a/tools/test_buildSIM800/test_build.ino b/tools/test_buildSIM800/test_build.ino
index acc2118..ad24b86 100644
--- a/tools/test_buildSIM800/test_build.ino
+++ b/tools/test_buildSIM800/test_build.ino
@@ -33,11 +33,13 @@ void loop() {
   modem.factoryDefault();
 
   // Test the SIM card functions
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) || defined(TINY_GSM_MODEM_XBEE)
   modem.getSimCCID();
   modem.getIMEI();
   modem.getSimStatus();
   modem.getRegistrationStatus();
   modem.getOperator();
+  #endif
 
 
   // Test the Networking functions
@@ -72,6 +74,6 @@ void loop() {
   #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.gprsDisconnect();
   #else
-  networkDisconnect()
+  modem.networkDisconnect()
   #endif
 }
diff --git a/tools/test_buildXBee/test_build.ino b/tools/test_buildXBee/test_build.ino
index ac5c7bf..7ce3621 100644
--- a/tools/test_buildXBee/test_build.ino
+++ b/tools/test_buildXBee/test_build.ino
@@ -33,11 +33,13 @@ void loop() {
   modem.factoryDefault();
 
   // Test the SIM card functions
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) || defined(TINY_GSM_MODEM_XBEE)
   modem.getSimCCID();
   modem.getIMEI();
   modem.getSimStatus();
   modem.getRegistrationStatus();
   modem.getOperator();
+  #endif
 
 
   // Test the Networking functions
@@ -72,6 +74,6 @@ void loop() {
   #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.gprsDisconnect();
   #else
-  networkDisconnect()
+  modem.networkDisconnect()
   #endif
 }