diff --git a/extras/test_build/test_build.ino b/extras/test_build/test_build.ino
index 83c3dc6f..051a3c01 100644
--- a/extras/test_build/test_build.ino
+++ b/extras/test_build/test_build.ino
@@ -6,7 +6,8 @@
 
 #include <TinyGsmClient.h>
 
-TinyGsmClient client(Serial);
+TinyGsm modem(Serial);
+TinyGsmClient client(modem);
 
 char server[] = "somewhere";
 char resource[] = "something";
@@ -14,11 +15,23 @@ char resource[] = "something";
 void setup() {
   Serial.begin(115200);
   delay(3000);
-  client.restart();
+  modem.restart();
 }
 
 void loop() {
-  if (!client.networkConnect("YourAPN", "", "")) {
+  modem.restart();
+
+  modem.begin();
+
+  modem.getOperator();
+
+  modem.getSimCCID();
+  
+  modem.getSimStatus();
+
+  modem.waitForNetwork();
+
+  if (!modem.gprsConnect("YourAPN", "", "")) {
     delay(10000);
     return;
   }
@@ -43,7 +56,7 @@ void loop() {
 
   client.stop();
 
-  client.networkDisconnect();
+  modem.gprsDisconnect();
 
   // Do nothing forevermore
   while (true) {
diff --git a/tools/SimpleTest/SimpleTest.ino b/tools/SimpleTest/SimpleTest.ino
index bffa91d5..7538636b 100644
--- a/tools/SimpleTest/SimpleTest.ino
+++ b/tools/SimpleTest/SimpleTest.ino
@@ -60,7 +60,7 @@ void setup() {
 }
 
 void loop() {
-  if (!modem.networkConnect(apn, user, pass)) {
+  if (!modem.gprsConnect(apn, user, pass)) {
     delay(10000);
     return;
   }
@@ -92,7 +92,7 @@ void loop() {
 
   client.stop();
 
-  modem.networkDisconnect();
+  modem.gprsDisconnect();
 
   SerialMon.println();
   SerialMon.println("************************");