diff --git a/.travis.yml b/.travis.yml
index f49d1d7..9a9b832 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,11 @@ env:
     - PLATFORMIO_CI_SRC=tools/FactoryReset
 
     # Arduino test
-    - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
+    - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='build_flag=-DTINY_GSM_MODEM_SIM800' --project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
+    - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='build_flag=-DTINY_GSM_MODEM_A6' --project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
+    - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='build_flag=-DTINY_GSM_MODEM_M590' --project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
+    - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='build_flag=-DTINY_GSM_MODEM_ESP8266' --project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
+    - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='build_flag=-DTINY_GSM_MODEM_XBEE' --project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
 
     # Energia test
     - PLATFORMIO_CI_SRC=tools/test_build PLATFORMIO_CI_ARGS="--project-option='framework=energia' --board=lplm4f120h5qr"
diff --git a/tools/test_build/test_build.ino b/tools/test_build/test_build.ino
index c29294d..2139625 100644
--- a/tools/test_build/test_build.ino
+++ b/tools/test_build/test_build.ino
@@ -4,7 +4,11 @@
  *
  **************************************************************/
 
-#define TINY_GSM_MODEM_SIM800
+ #define TINY_GSM_MODEM_SIM800
+ //#define TINY_GSM_MODEM_A6
+ //#define TINY_GSM_MODEM_M590
+ //#define TINY_GSM_MODEM_ESP8266
+ //#define TINY_GSM_MODEM_XBEE
 
 #include <TinyGsmClient.h>
 
@@ -21,26 +25,34 @@ void setup() {
 }
 
 void loop() {
-  modem.restart();
 
+  // Test the start/restart functions
+  modem.restart();
   modem.begin();
+  modem.autoBaud();
+  modem.factoryDefault();
 
-  modem.getOperator();
-
+  // Test the SIM card functions
   modem.getSimCCID();
-  
+  modem.getIMEI();
   modem.getSimStatus();
+  modem.getRegistrationStatus();
+  modem.getOperator();
+
+
+  // Test the Networking functions
+  modem.getSignalQuality();
 
+
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.waitForNetwork();
+  modem.gprsConnect("YourAPN", "", "");
+  #else
+    modem.networkConnect("YourSSID", "YourPWD");
+    modem.waitForNetwork();
+  #endif
 
-  if (!modem.gprsConnect("YourAPN", "", "")) {
-    delay(10000);
-    return;
-  }
-  if (!client.connect(server, 80)) {
-    delay(10000);
-    return;
-  }
+  client.connect(server, 80);
 
   // Make a HTTP GET request:
   client.print(String("GET ") + resource + " HTTP/1.0\r\n");
@@ -49,20 +61,17 @@ void loop() {
 
   unsigned long timeout = millis();
   while (client.connected() && millis() - timeout < 10000L) {
-    // Print available data
     while (client.available()) {
-      char c = client.read();
+      client.read();
       timeout = millis();
     }
   }
 
   client.stop();
 
+  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
   modem.gprsDisconnect();
-
-  // Do nothing forevermore
-  while (true) {
-    delay(1000);
-  }
+  #else
+  networkDisconnect()
+  #endif
 }
-