From 142c51d25c7f5b1aa7fc98571328ee1d5ca34775 Mon Sep 17 00:00:00 2001
From: "Ruben O. Chiavone" <ruben.ochiavone@gmail.com>
Date: Sat, 5 Dec 2020 16:00:17 -0300
Subject: [PATCH] Implement response parser for EnhancedImplementation

---
 .../java/rastreio/DefaultImplementation.java  |   2 +-
 .../java/rastreio/EnhancedImplementation.java | 137 +++-
 .../java/rastreio/RastreioMockedTest.java     | 691 +++++++++---------
 src/test/java/rastreio/RastreioTest.java      | 641 ++++++++++------
 src/test/java/rastreio/Util.java              |   3 +
 5 files changed, 894 insertions(+), 580 deletions(-)

diff --git a/src/main/java/rastreio/DefaultImplementation.java b/src/main/java/rastreio/DefaultImplementation.java
index a8c9155..99e7b81 100644
--- a/src/main/java/rastreio/DefaultImplementation.java
+++ b/src/main/java/rastreio/DefaultImplementation.java
@@ -87,7 +87,7 @@ private static Request newRequest(String objectCode) {
    * @param response response data to be parsed
    * @return new tracking object
    */
-  public static TrackObject parseResponse(String objectCode, String response) {
+  private TrackObject parseResponse(String objectCode, String response) {
     TrackObjectServiceType serviceType = TrackObjectServiceType.UNKNOWN;
 
     try {
diff --git a/src/main/java/rastreio/EnhancedImplementation.java b/src/main/java/rastreio/EnhancedImplementation.java
index dd48b5b..ac60bc1 100644
--- a/src/main/java/rastreio/EnhancedImplementation.java
+++ b/src/main/java/rastreio/EnhancedImplementation.java
@@ -1,6 +1,9 @@
 package rastreio;
 
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -17,12 +20,17 @@
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 
 /**
  * Enhanced implementation using OkHttp and Jsoup (from DefaultImplementation).
  */
 public class EnhancedImplementation implements Implementation {
   private static final OkHttpClient HTTP_CLIENT;
+  private static final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss SSS");
 
   static {
     HTTP_CLIENT = new OkHttpClient.Builder()
@@ -47,8 +55,7 @@ public void onResponse(Call call, Response response) throws IOException {
         }
         try (ResponseBody responseBody = response.body()) {
           // Parse response and notify listener about new tacking object
-          listener.onSuccess(DefaultImplementation.parseResponse(objectCode,
-              responseBody.string()));
+          listener.onSuccess(parseResponse(objectCode, responseBody.string()));
         } catch (IOException e) {
           listener.onFailure(new Exception("Rastreio.track: unable to fullfill HTTP request", e));
         }
@@ -71,7 +78,7 @@ public TrackObject trackSync(String objectCode) throws IOException {
         ((InMemoryCookieJar) HTTP_CLIENT.cookieJar()).clear();
       }
       // Parse response and return new tacking object
-      return DefaultImplementation.parseResponse(objectCode, response.body().string());
+      return parseResponse(objectCode, response.body().string());
     } catch (IOException e) {
       throw new IOException("Rastreio.trackSync: unable to fullfill HTTP request", e);
     }
@@ -101,6 +108,130 @@ private static Request newRequest(String objectCode) {
     return request;
   }
 
+  /**
+   * Parse response data and create new tracking object.
+   * @param objectCode tracking object code
+   * @param response response data to be parsed
+   * @return new tracking object
+   */
+  private TrackObject parseResponse(String objectCode, String response) {
+    TrackObjectServiceType serviceType = TrackObjectServiceType.UNKNOWN;
+
+    try {
+      serviceType = TrackObjectServiceType.valueOf(objectCode.substring(0, 2));
+    } catch (Exception e) {
+      // ignore
+    }
+
+    TrackObject trackObject = new TrackObject();
+    trackObject.setCode(objectCode);
+    trackObject.setServiceType(serviceType);
+    trackObject.setError(Error.OBJECT_NOT_FOUND);
+    trackObject.setValid(false);
+    trackObject.setDelivered(false);
+
+    Document document = Jsoup.parse(response);
+    Elements elements = document.getElementsByClass("listEvent");
+
+    if (elements.isEmpty()) {
+      return trackObject;
+    }
+
+    ArrayList<TrackObject.Event> events = new ArrayList<TrackObject.Event>();
+
+    for (Element eventListItem : elements) {
+      elements = eventListItem.getElementsByTag("tr").first().getElementsByTag("td");
+
+      if (elements.size() != 2) {
+        System.out.println("Rastreio.parseResponse: couldn't find enough table data elements");
+        continue; // Skip invalid table row
+      }
+
+      final Element eventListFirstData = elements.first();
+      final Element eventListLastData = elements.last();
+
+      String eventListFirstDataHtml = eventListFirstData.html();
+      String[] eventListFirstDataPieces = eventListFirstDataHtml.trim().split("<br>");
+
+      if (eventListFirstDataPieces.length != 3) {
+        System.out
+            .println("Rastreio.parseResponse: couldn't parse first table data element properly");
+        continue; // Skip invalid table row
+      }
+
+      String eventDate = eventListFirstDataPieces[0].trim();
+      String eventTime = eventListFirstDataPieces[1].trim();
+
+      elements = eventListFirstData.getElementsByTag("label");
+
+      String locale = null;
+
+      if (!elements.isEmpty()) {
+        locale = elements.first().text().trim();
+      } else {
+        locale = eventListFirstDataPieces[2].trim();
+      }
+
+      String eventListLastDataHtml = eventListLastData.html();
+      String[] eventListLastDataPieces = eventListLastDataHtml.trim().split("<br>");
+
+      elements = eventListLastData.getElementsByTag("strong");
+
+      String description = null;
+
+      if (!elements.isEmpty()) {
+        // Get `strong` node content
+        description = elements.first().text().trim();
+      } else if (eventListLastDataPieces.length > 0) {
+        // Get first string element as event description
+        description = eventListLastDataPieces[0].trim();
+      } 
+      
+      if (description == null || description.isEmpty()) {
+        System.out
+            .println("Rastreio.parseResponse: couldn't parse last table data element properly");
+        continue; // Skip invalid table row
+      }
+
+      String details = null;
+
+      if (eventListLastDataPieces.length > 1
+          && !eventListLastDataPieces[1].trim().startsWith("<!--")) {
+        // Get second string element as event details
+        details = eventListLastDataPieces[1].trim();
+      }
+
+      TrackObject.Event event = new TrackObject.Event();
+      event.setLocale(locale);
+      event.setDescription(description);
+      event.setDetails(details);
+      try {
+        event.setTrackedAt(DATE_FORMAT.parse(eventDate + " " + eventTime + ":00 000"));
+      } catch (ParseException e) {
+        System.out.println("Rastreio.parseResponse: couldn't parse event date and time properly");
+        continue; // Skip invalid table row
+      }
+
+      events.add(0, event);
+    }
+
+    if (events.isEmpty()) {
+      return trackObject;
+    }
+
+    TrackObject.Event first = events.get(0);
+    TrackObject.Event last = events.get(events.size() - 1);
+
+    trackObject.setError(Error.NO_ERROR);
+    trackObject.setValid(true);
+    trackObject.setEvents(events);
+    trackObject.setDelivered(last.getDescription().toLowerCase().contains("objeto entregue"));
+    trackObject.setPostedAt(first.getTrackedAt());
+    trackObject.setUpdatedAt(last.getTrackedAt());
+
+    return trackObject;
+  }
+
   /**
    * In memory cookie jar implementation.
    * Inspired by https://github.com/square/okhttp/issues/2890#issuecomment-600171522.
diff --git a/src/test/java/rastreio/RastreioMockedTest.java b/src/test/java/rastreio/RastreioMockedTest.java
index 392bfad..9dfe9f9 100644
--- a/src/test/java/rastreio/RastreioMockedTest.java
+++ b/src/test/java/rastreio/RastreioMockedTest.java
@@ -47,56 +47,6 @@ public void tearDownServer() {
 
   @Test
   public void testTrack() {
-    Rastreio.Listener dummyListener = new Rastreio.Listener() {
-      @Override
-      public void onSuccess(TrackObject trackObject) {
-      }
-
-      @Override
-      public void onFailure(Exception e) {
-      }
-    };
-
-    try {
-      Rastreio.track(null, dummyListener);
-
-      fail("Should have thrown NullPointerException");
-    } catch (NullPointerException e) {
-      assertTrue(true);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
-
-    try {
-      Rastreio.track("JT124720455BR", null);
-
-      fail("Should have thrown NullPointerException");
-    } catch (NullPointerException e) {
-      assertTrue(true);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
-
-    try {
-      Rastreio.track("", dummyListener);
-
-      fail("Should have thrown IllegalArgumentException");
-    } catch (IllegalArgumentException e) {
-      assertTrue(true);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
-
-    try {
-      Rastreio.track("invalid", dummyListener);
-
-      fail("Should have thrown IllegalArgumentException");
-    } catch (IllegalArgumentException e) {
-      assertTrue(true);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
-
     final long syncTimeout = 2000L;
 
     try {
@@ -138,229 +88,242 @@ public void onFailure(Exception e) {
       fail(e.getMessage());
     }
 
-    // Kill mocked server to simulate server down
-    try {
-      Util.tearDownMockWebServer(mMockWebServer, true);
-      mMockWebServer = null;
-
-      final Object syncObject = new Object();
-
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
-        @Override
-        public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
-          }
-
-          fail("Tracking object without server configured should NOT succeed");
-        }
-      
-        @Override
-        public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
-          }
-
-          assertNotNull(e);
-          assertNotNull(e.getMessage());
-        }
-      });
+    Implementation[] implementations = new Implementation[] {
+      new EnhancedImplementation(),
+      new DefaultImplementation()
+    };
 
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+    for (Implementation implementation : implementations) {
+      try {
+        Rastreio.setImplementation(implementation);
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
 
-      // Restart mocked server
-      mMockWebServer = Util.setupMockWebServer();
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
+      // Kill mocked server to simulate server down
+      try {
+        Util.tearDownMockWebServer(mMockWebServer, true);
+        mMockWebServer = null;
 
-    // Mock response to cover edge cases
-    try {
-      final Object syncObject = new Object();
+        final Object syncObject = new Object();
 
-      Util.enqueueMockResponseFromFile(mMockWebServer, "mocked.html");
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
 
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
-        @Override
-        public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
+            fail("Tracking object without server configured should NOT succeed");
           }
-
-          assertNotNull(trackObject);
-          assertEquals("JT124720455BR", trackObject.getCode());
-          assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
-          assertEquals("JT", trackObject.getServiceType().getInitials());
-          assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
-          assertFalse(trackObject.isValid());
-          assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-          assertNull(trackObject.getEvents());
-        }
-      
-        @Override
-        public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(e);
+            assertNotNull(e.getMessage());
           }
+        });
 
-          fail(e.getMessage());
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
         }
-      });
 
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+        // Restart mocked server
+        mMockWebServer = Util.setupMockWebServer();
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
-
-    // Force unexpected response
-    try {
-      final Object syncObject = new Object();
-
-      Util.enqueueMockResponseFromFile(mMockWebServer, "invalid.txt");
 
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
-        @Override
-        public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
+      // Mock response to cover edge cases
+      try {
+        final Object syncObject = new Object();
+
+        Util.enqueueMockResponseFromFile(mMockWebServer, "mocked.html");
+
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(trackObject);
+            assertEquals("JT124720455BR", trackObject.getCode());
+            assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
+            assertEquals("JT", trackObject.getServiceType().getInitials());
+            assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
+            assertFalse(trackObject.isValid());
+            assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+            assertNull(trackObject.getEvents());
           }
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            fail(e.getMessage());
+          }
+        });
 
-          assertNotNull(trackObject);
-          assertEquals("JT124720455BR", trackObject.getCode());
-          assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
-          assertEquals("JT", trackObject.getServiceType().getInitials());
-          assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
-          assertFalse(trackObject.isValid());
-          assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
         }
-      
-        @Override
-        public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+
+      // Force unexpected response
+      try {
+        final Object syncObject = new Object();
+
+        Util.enqueueMockResponseFromFile(mMockWebServer, "invalid.txt");
+
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(trackObject);
+            assertEquals("JT124720455BR", trackObject.getCode());
+            assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
+            assertEquals("JT", trackObject.getServiceType().getInitials());
+            assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
+            assertFalse(trackObject.isValid());
+            assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
           }
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            fail(e.getMessage());
+          }
+        });
 
-          fail(e.getMessage());
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
         }
-      });
-
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
 
-    // Force server response with 500 status code
-    try {
-      final Object syncObject = new Object();
+      // Force server response with 500 status code
+      try {
+        final Object syncObject = new Object();
 
-      Util.enqueueMockResponseFromStatusCode(mMockWebServer, 500);
+        Util.enqueueMockResponseFromStatusCode(mMockWebServer, 500);
 
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
-        @Override
-        public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
-          }
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
 
-          fail("Tracking object with 5xx status code should NOT succeed");
-        }
-      
-        @Override
-        public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
+            fail("Tracking object with 5xx status code should NOT succeed");
+          }
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(e);
+            assertNotNull(e.getMessage());
           }
+        });
 
-          assertNotNull(e);
-          assertNotNull(e.getMessage());
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
         }
-      });
-
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
 
-    // Force server response timeout
-    try {
-      final Object syncObject = new Object();
+      // Force server response timeout
+      try {
+        final Object syncObject = new Object();
 
-      Util.enqueueMockResponseWithNoResponse(mMockWebServer);
+        Util.enqueueMockResponseWithNoResponse(mMockWebServer);
 
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
-        @Override
-        public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
-          }
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
 
-          fail("Tracking object with no response should NOT succeed");
-        }
-      
-        @Override
-        public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
+            fail("Tracking object with no response should NOT succeed");
           }
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(e);
+            assertNotNull(e.getMessage());
+          }
+        });
 
-          assertNotNull(e);
-          assertNotNull(e.getMessage());
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
         }
-      });
-
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
 
-    // Force no body at server response
-    try {
-      final Object syncObject = new Object();
+      // Force no body at server response
+      try {
+        final Object syncObject = new Object();
 
-      Util.enqueueMockResponseWithNoResponseBody(mMockWebServer);
+        Util.enqueueMockResponseWithNoResponseBody(mMockWebServer);
 
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
-        @Override
-        public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
-          }
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
 
-          fail("Tracking object with no response body should NOT succeed");
-        }
-      
-        @Override
-        public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
+            fail("Tracking object with no response body should NOT succeed");
           }
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(e);
+            assertNotNull(e.getMessage());
+          }
+        });
 
-          assertNotNull(e);
-          assertNotNull(e.getMessage());
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
         }
-      });
-
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
-    } catch (Exception e) {
-      fail(e.getMessage());
     }
   }
 
@@ -368,36 +331,6 @@ public void onFailure(Exception e) {
   public void testTrackSync() {
     final Calendar calendar = Calendar.getInstance();
 
-    try {
-      Rastreio.trackSync(null);
-
-      fail("Should have thrown NullPointerException");
-    } catch (NullPointerException e) {
-      assertTrue(true);
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
-
-    try {
-      Rastreio.trackSync("");
-
-      fail("Should have thrown IllegalArgumentException");
-    } catch (IllegalArgumentException e) {
-      assertTrue(true);
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
-
-    try {
-      Rastreio.trackSync("invalid");
-
-      fail("Should have thrown IllegalArgumentException");
-    } catch (IllegalArgumentException e) {
-      assertTrue(true);
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
-
     try {
       Util.enqueueMockResponseFromFile(mMockWebServer, "JT124720455BR.html");
     } catch (Exception e) {
@@ -1032,116 +965,186 @@ public void testTrackSync() {
       fail(e.getMessage());
     }
 
-    // Kill mocked server to simulate server down
-    try {
-      Util.tearDownMockWebServer(mMockWebServer, true);
-      mMockWebServer = null;
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
-
-    try {
-      Rastreio.trackSync("LB679011587SE");
-      fail("Tracking object without server configured should NOT succeed");
-    } catch (IOException e) {
-      assertNotNull(e);
-      assertNotNull(e.getMessage());
-    }
-
-    // Restart mocked server
+    // FIXME:
+    /*
     try {
-      mMockWebServer = Util.setupMockWebServer();
+      Rastreio.setImplementation(new EnhancedImplementation());
     } catch (Exception e) {
       fail(e.getMessage());
     }
-    
 
-    // Mock response to cover edge cases
     try {
-      Util.enqueueMockResponseFromFile(mMockWebServer, "mocked.html");
+      Util.enqueueMockResponseFromFile(mMockWebServer, "LB929795602SE.html");
     } catch (Exception e) {
       fail(e.getMessage());
     }
 
     try {
-      TrackObject trackObject = Rastreio.trackSync("JT124720455BR");
+      TrackObject trackObject = Rastreio.trackSync("LB929795602SE");
 
       assertNotNull(trackObject);
-      assertEquals("JT124720455BR", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
-      assertEquals("JT", trackObject.getServiceType().getInitials());
-      assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-      assertNull(trackObject.getEvents());
+      assertEquals("LB929795602SE", trackObject.getCode());
+      assertEquals("LB", trackObject.getServiceType().getInitials());
+      assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
+          trackObject.getServiceType().getDescription());
+      assertTrue(trackObject.isValid());
+      assertFalse(trackObject.isDelivered());
+      assertEquals(Error.NO_ERROR, trackObject.getError());
+      calendar.set(2020, 10, 15, 13, 26, 0);
+      calendar.set(Calendar.MILLISECOND, 0);
+      assertEquals(calendar.getTime(), trackObject.getPostedAt());
+      calendar.set(2020, 10, 15, 13, 49, 0);
+      calendar.set(Calendar.MILLISECOND, 0);
+      assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
+      assertNotNull(trackObject.getEvents());
+      assertEquals(2, trackObject.getEvents().size());
+      // First event
+      TrackObject.Event event = trackObject.getEvents().get(0);
+      assertNotNull(event);
+      assertEquals("Objeto postado", event.getDescription());
+      assertNull(event.getDetails());
+      assertEquals("SUECIA /", event.getLocale());
+      calendar.set(2020, 10, 15, 13, 26, 0);
+      calendar.set(Calendar.MILLISECOND, 0);
+      assertEquals(calendar.getTime(), event.getTrackedAt());
+      // Last event
+      event = trackObject.getEvents().get(1);
+      assertNotNull(event);
+      assertEquals("Objeto recebido na unidade de exportação no país de origem",
+          event.getDescription());
+      assertNull(event.getDetails());
+      assertEquals("SUECIA /", event.getLocale());
+      calendar.set(2020, 10, 15, 13, 49, 0);
+      calendar.set(Calendar.MILLISECOND, 0);
+      assertEquals(calendar.getTime(), event.getTrackedAt());
     } catch (IOException e) {
       fail(e.getMessage());
     }
+    */
 
-    // Force unexpected response
-    try {
-      Util.enqueueMockResponseFromFile(mMockWebServer, "invalid.txt");
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
+    Implementation[] implementations = new Implementation[] {
+      new EnhancedImplementation(),
+      new DefaultImplementation()
+    };
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("JT124720455BR");
+    for (Implementation implementation : implementations) {
+      try {
+        Rastreio.setImplementation(implementation);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
 
-      assertNotNull(trackObject);
-      assertEquals("JT124720455BR", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
-      assertEquals("JT", trackObject.getServiceType().getInitials());
-      assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
+      // Kill mocked server to simulate server down
+      try {
+        Util.tearDownMockWebServer(mMockWebServer, true);
+        mMockWebServer = null;
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
 
-    // Force server response with 500 status code
-    try {
-      Util.enqueueMockResponseFromStatusCode(mMockWebServer, 500);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
+      try {
+        Rastreio.trackSync("LB679011587SE");
+        fail("Tracking object without server configured should NOT succeed");
+      } catch (IOException e) {
+        assertNotNull(e);
+        assertNotNull(e.getMessage());
+      }
 
-    try {
-      Rastreio.trackSync("LB679011587SE");
-      fail("Tracking object with 5xx status code should NOT succeed");
-    } catch (IOException e) {
-      assertNotNull(e);
-      assertNotNull(e.getMessage());
-    }
+      // Restart mocked server
+      try {
+        mMockWebServer = Util.setupMockWebServer();
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+      
 
-    // Force server response timeout
-    try {
-      Util.enqueueMockResponseWithNoResponse(mMockWebServer);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
+      // Mock response to cover edge cases
+      try {
+        Util.enqueueMockResponseFromFile(mMockWebServer, "mocked.html");
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
 
-    try {
-      Rastreio.trackSync("LB679011587SE");
-      fail("Tracking object with no response should NOT succeed");
-    } catch (IOException e) {
-      assertNotNull(e);
-      assertNotNull(e.getMessage());
-    }
+      try {
+        TrackObject trackObject = Rastreio.trackSync("JT124720455BR");
+
+        assertNotNull(trackObject);
+        assertEquals("JT124720455BR", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
+        assertEquals("JT", trackObject.getServiceType().getInitials());
+        assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+        assertNull(trackObject.getEvents());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
 
-    // Force no body at server response
-    try {
-      Util.enqueueMockResponseWithNoResponseBody(mMockWebServer);
-    } catch (Exception e) {
-      fail(e.getMessage());
-    }
+      // Force unexpected response
+      try {
+        Util.enqueueMockResponseFromFile(mMockWebServer, "invalid.txt");
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
 
-    try {
-      Rastreio.trackSync("LB679011587SE");
-      fail("Tracking object with no response body should NOT succeed");
-    } catch (IOException e) {
-      assertNotNull(e);
-      assertNotNull(e.getMessage());
+      try {
+        TrackObject trackObject = Rastreio.trackSync("JT124720455BR");
+
+        assertNotNull(trackObject);
+        assertEquals("JT124720455BR", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
+        assertEquals("JT", trackObject.getServiceType().getInitials());
+        assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      // Force server response with 500 status code
+      try {
+        Util.enqueueMockResponseFromStatusCode(mMockWebServer, 500);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        Rastreio.trackSync("LB679011587SE");
+        fail("Tracking object with 5xx status code should NOT succeed");
+      } catch (IOException e) {
+        assertNotNull(e);
+        assertNotNull(e.getMessage());
+      }
+
+      // Force server response timeout
+      try {
+        Util.enqueueMockResponseWithNoResponse(mMockWebServer);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        Rastreio.trackSync("LB679011587SE");
+        fail("Tracking object with no response should NOT succeed");
+      } catch (IOException e) {
+        assertNotNull(e);
+        assertNotNull(e.getMessage());
+      }
+
+      // Force no body at server response
+      try {
+        Util.enqueueMockResponseWithNoResponseBody(mMockWebServer);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        Rastreio.trackSync("LB679011587SE");
+        fail("Tracking object with no response body should NOT succeed");
+      } catch (IOException e) {
+        assertNotNull(e);
+        assertNotNull(e.getMessage());
+      }
     }
   }
 }
diff --git a/src/test/java/rastreio/RastreioTest.java b/src/test/java/rastreio/RastreioTest.java
index 224c4f7..bb999f5 100644
--- a/src/test/java/rastreio/RastreioTest.java
+++ b/src/test/java/rastreio/RastreioTest.java
@@ -17,41 +17,104 @@ public class RastreioTest {
   public void testTrack() {
     final long syncTimeout = (long) new OkHttpClient().readTimeoutMillis();
 
-    try {
-      final Object syncObject = new Object();
+    Implementation[] implementations = new Implementation[] {
+      new EnhancedImplementation(),
+      new DefaultImplementation()
+    };
 
-      Rastreio.track("JT124720455BR", new Rastreio.Listener() {
-      
+    for (Implementation implementation : implementations) {
+      try {
+        Rastreio.setImplementation(implementation);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+
+      Rastreio.Listener dummyListener = new Rastreio.Listener() {
         @Override
         public void onSuccess(TrackObject trackObject) {
-          synchronized (syncObject) {
-            syncObject.notify();
-          }
-
-          assertNotNull(trackObject);
-          assertEquals("JT124720455BR", trackObject.getCode());
-          assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
-          assertEquals("JT", trackObject.getServiceType().getInitials());
-          assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
-          assertFalse(trackObject.isValid());
-          assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
         }
-      
+  
         @Override
         public void onFailure(Exception e) {
-          synchronized (syncObject) {
-            syncObject.notify();
+        }
+      };
+  
+      try {
+        Rastreio.track(null, dummyListener);
+  
+        fail("Should have thrown NullPointerException");
+      } catch (NullPointerException e) {
+        assertTrue(true);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+  
+      try {
+        Rastreio.track("JT124720455BR", null);
+  
+        fail("Should have thrown NullPointerException");
+      } catch (NullPointerException e) {
+        assertTrue(true);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+  
+      try {
+        Rastreio.track("", dummyListener);
+  
+        fail("Should have thrown IllegalArgumentException");
+      } catch (IllegalArgumentException e) {
+        assertTrue(true);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+  
+      try {
+        Rastreio.track("invalid", dummyListener);
+  
+        fail("Should have thrown IllegalArgumentException");
+      } catch (IllegalArgumentException e) {
+        assertTrue(true);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        final Object syncObject = new Object();
+
+        Rastreio.track("JT124720455BR", new Rastreio.Listener() {
+        
+          @Override
+          public void onSuccess(TrackObject trackObject) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
+
+            assertNotNull(trackObject);
+            assertEquals("JT124720455BR", trackObject.getCode());
+            assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
+            assertEquals("JT", trackObject.getServiceType().getInitials());
+            assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
+            assertFalse(trackObject.isValid());
+            assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
           }
+        
+          @Override
+          public void onFailure(Exception e) {
+            synchronized (syncObject) {
+              syncObject.notify();
+            }
 
-          fail(e.getMessage());
-        }
-      });
+            fail(e.getMessage());
+          }
+        });
 
-      synchronized (syncObject) {
-        syncObject.wait(syncTimeout);
+        synchronized (syncObject) {
+          syncObject.wait(syncTimeout);
+        }
+      } catch (Exception e) {
+        fail(e.getMessage());
       }
-    } catch (Exception e) {
-      fail(e.getMessage());
     }
   }
 
@@ -59,228 +122,342 @@ public void onFailure(Exception e) {
   public void testTrackSync() {
     final Calendar calendar = Calendar.getInstance();
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("JT124720455BR");
-
-      assertNotNull(trackObject);
-      assertEquals("JT124720455BR", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
-      assertEquals("JT", trackObject.getServiceType().getInitials());
-      assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
+    Implementation[] implementations = new Implementation[] {
+      new EnhancedImplementation(),
+      new DefaultImplementation()
+    };
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("LO637869431CN");
-
-      assertNotNull(trackObject);
-      assertEquals("LO637869431CN", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.UNKNOWN, trackObject.getServiceType());
-      assertEquals("", trackObject.getServiceType().getInitials());
-      assertEquals("", trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
+    for (Implementation implementation : implementations) {
+      try {
+        Rastreio.setImplementation(implementation);
+      } catch (Exception e) {
+        fail(e.getMessage());
+      }
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("LB107580877SG");
-
-      assertNotNull(trackObject);
-      assertEquals("LB107580877SG", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.LB, trackObject.getServiceType());
-      assertEquals("LB", trackObject.getServiceType().getInitials());
-      assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
-          trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
+      try {
+        Rastreio.trackSync(null);
+  
+        fail("Should have thrown NullPointerException");
+      } catch (NullPointerException e) {
+        assertTrue(true);
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+  
+      try {
+        Rastreio.trackSync("");
+  
+        fail("Should have thrown IllegalArgumentException");
+      } catch (IllegalArgumentException e) {
+        assertTrue(true);
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+  
+      try {
+        Rastreio.trackSync("invalid");
+  
+        fail("Should have thrown IllegalArgumentException");
+      } catch (IllegalArgumentException e) {
+        assertTrue(true);
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("RH117939038TR");
-
-      assertNotNull(trackObject);
-      assertEquals("RH117939038TR", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.RH, trackObject.getServiceType());
-      assertEquals("RH", trackObject.getServiceType().getInitials());
-      assertEquals("REGISTRADO COM AR DIGITAL", trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
+      try {
+        TrackObject trackObject = Rastreio.trackSync("JT124720455BR");
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("LO823618663CN");
-
-      assertNotNull(trackObject);
-      assertEquals("LO823618663CN", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.UNKNOWN, trackObject.getServiceType());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
-    }
+        assertNotNull(trackObject);
+        assertEquals("JT124720455BR", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.JT, trackObject.getServiceType());
+        assertEquals("JT", trackObject.getServiceType().getInitials());
+        assertEquals("REGISTRADO URGENTE", trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
 
-    try {
-      TrackObject trackObject = Rastreio.trackSync("LX639826650CN");
-
-      assertNotNull(trackObject);
-      assertEquals("LX639826650CN", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.LX, trackObject.getServiceType());
-      assertEquals("LX", trackObject.getServiceType().getInitials());
-      assertEquals("OBJETO INTERNACIONAL PACKET ECONOMIC",
-          trackObject.getServiceType().getDescription());
-      assertFalse(trackObject.isValid());
-      assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
-    } catch (IOException e) {
-      fail(e.getMessage());
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LO637869431CN");
+
+        assertNotNull(trackObject);
+        assertEquals("LO637869431CN", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.UNKNOWN, trackObject.getServiceType());
+        assertEquals("", trackObject.getServiceType().getInitials());
+        assertEquals("", trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LB107580877SG");
+
+        assertNotNull(trackObject);
+        assertEquals("LB107580877SG", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.LB, trackObject.getServiceType());
+        assertEquals("LB", trackObject.getServiceType().getInitials());
+        assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
+            trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("RH117939038TR");
+
+        assertNotNull(trackObject);
+        assertEquals("RH117939038TR", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.RH, trackObject.getServiceType());
+        assertEquals("RH", trackObject.getServiceType().getInitials());
+        assertEquals("REGISTRADO COM AR DIGITAL", trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LO823618663CN");
+
+        assertNotNull(trackObject);
+        assertEquals("LO823618663CN", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.UNKNOWN, trackObject.getServiceType());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LX639826650CN");
+
+        assertNotNull(trackObject);
+        assertEquals("LX639826650CN", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.LX, trackObject.getServiceType());
+        assertEquals("LX", trackObject.getServiceType().getInitials());
+        assertEquals("OBJETO INTERNACIONAL PACKET ECONOMIC",
+            trackObject.getServiceType().getDescription());
+        assertFalse(trackObject.isValid());
+        assertEquals(Error.OBJECT_NOT_FOUND, trackObject.getError());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+      
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LB941561336SE");
+
+        assertNotNull(trackObject);
+        assertEquals("LB941561336SE", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.LB, trackObject.getServiceType());
+        assertEquals("LB", trackObject.getServiceType().getInitials());
+        assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
+            trackObject.getServiceType().getDescription());
+        assertTrue(trackObject.isValid());
+        assertTrue(!trackObject.isDelivered());
+        assertEquals(Error.NO_ERROR, trackObject.getError());
+        calendar.set(2020, 10, 27, 15, 2, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getPostedAt());
+        calendar.set(2020, 10, 27, 15, 22, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
+        assertNotNull(trackObject.getEvents());
+        assertEquals(2, trackObject.getEvents().size());
+        // First event
+        TrackObject.Event event = trackObject.getEvents().get(0);
+        assertNotNull(event);
+        assertEquals("Objeto postado", event.getDescription());
+        assertNull(event.getDetails());
+        assertEquals("SUECIA /", event.getLocale());
+        calendar.set(2020, 10, 27, 15, 2, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+        // Last event
+        event = trackObject.getEvents().get(1);
+        assertNotNull(event);
+        assertEquals("Objeto recebido na unidade de exportação no país de origem",
+            event.getDescription());
+        assertNull(event.getDetails());
+        assertEquals("SUECIA /", event.getLocale());
+        calendar.set(2020, 10, 27, 15, 22, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LB918031405SE");
+
+        assertNotNull(trackObject);
+        assertEquals("LB918031405SE", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.LB, trackObject.getServiceType());
+        assertEquals("LB", trackObject.getServiceType().getInitials());
+        assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
+            trackObject.getServiceType().getDescription());
+        assertTrue(trackObject.isValid());
+        assertFalse(trackObject.isDelivered());
+        assertEquals(Error.NO_ERROR, trackObject.getError());
+        calendar.set(2020, 10, 16, 11, 56, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getPostedAt());
+        calendar.set(2020, 11, 1, 14, 59, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
+        assertNotNull(trackObject.getEvents());
+        assertEquals(6, trackObject.getEvents().size());
+        // First event
+        TrackObject.Event event = trackObject.getEvents().get(0);
+        assertNotNull(event);
+        assertEquals("Objeto postado", event.getDescription());
+        assertNull(event.getDetails());
+        assertEquals("SUECIA /", event.getLocale());
+        calendar.set(2020, 10, 16, 11, 56, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+        // Event with details
+        event = trackObject.getEvents().get(4);
+        assertNotNull(event);
+        assertEquals("Objeto em trânsito - por favor aguarde", event.getDescription());
+        assertEquals(
+            "de Unidade de Distribuição em CURITIBA / PR para Unidade de Tratamento em CAJAMAR / "
+            + "SP",
+            event.getDetails());
+        assertEquals("CURITIBA / PR", event.getLocale());
+        calendar.set(2020, 10, 30, 9, 55, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+        // Last event
+        event = trackObject.getEvents().get(5);
+        assertNotNull(event);
+        assertEquals("Objeto em trânsito - por favor aguarde", event.getDescription());
+        assertEquals(
+            "de Unidade de Tratamento em CAJAMAR / SP para Unidade de Tratamento em JABOATAO DOS "
+            + "GUARARAPES / PE",
+            event.getDetails());
+        assertEquals("CAJAMAR / SP", event.getLocale());
+        calendar.set(2020, 11, 1, 14, 59, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("LB929795602SE");
+
+        assertNotNull(trackObject);
+        assertEquals("LB929795602SE", trackObject.getCode());
+        assertEquals("LB", trackObject.getServiceType().getInitials());
+        assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
+            trackObject.getServiceType().getDescription());
+        assertTrue(trackObject.isValid());
+        assertFalse(trackObject.isDelivered());
+        assertEquals(Error.NO_ERROR, trackObject.getError());
+        calendar.set(2020, 10, 15, 13, 26, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getPostedAt());
+        calendar.set(2020, 10, 15, 13, 49, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
+        assertNotNull(trackObject.getEvents());
+        assertEquals(2, trackObject.getEvents().size());
+        // First event
+        TrackObject.Event event = trackObject.getEvents().get(0);
+        assertNotNull(event);
+        assertEquals("Objeto postado", event.getDescription());
+        assertNull(event.getDetails());
+        assertEquals("SUECIA /", event.getLocale());
+        calendar.set(2020, 10, 15, 13, 26, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+        // Last event
+        event = trackObject.getEvents().get(1);
+        assertNotNull(event);
+        assertEquals("Objeto recebido na unidade de exportação no país de origem",
+            event.getDescription());
+        assertNull(event.getDetails());
+        assertEquals("SUECIA /", event.getLocale());
+        calendar.set(2020, 10, 15, 13, 49, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+
+      try {
+        TrackObject trackObject = Rastreio.trackSync("OL221353180BR");
+
+        assertNotNull(trackObject);
+        assertEquals("OL221353180BR", trackObject.getCode());
+        assertEquals(TrackObjectServiceType.UNKNOWN, trackObject.getServiceType());
+        assertEquals("", trackObject.getServiceType().getInitials());
+        assertEquals("", trackObject.getServiceType().getDescription());
+        assertTrue(trackObject.isValid());
+        assertTrue(trackObject.isDelivered());
+        assertEquals(Error.NO_ERROR, trackObject.getError());
+        calendar.set(2020, 9, 30, 17, 55, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getPostedAt());
+        calendar.set(2020, 10, 10, 17, 1, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
+        assertNotNull(trackObject.getEvents());
+        assertEquals(6, trackObject.getEvents().size());
+        // First event
+        TrackObject.Event event = trackObject.getEvents().get(0);
+        assertNotNull(event);
+        assertEquals("Objeto postado após o horário limite da unidade", event.getDescription());
+        if (implementation instanceof EnhancedImplementation) {
+          assertEquals("Sujeito a encaminhamento no próximo dia útil", event.getDetails());
+        } else {
+          assertNull(event.getDetails());
+        }
+        assertEquals("Sao Paulo / SP", event.getLocale());
+        calendar.set(2020, 9, 30, 17, 55, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+        // Last event
+        event = trackObject.getEvents().get(5);
+        assertNotNull(event);
+        assertEquals("Objeto entregue ao destinatário", event.getDescription());
+        assertNull(event.getDetails());
+        assertEquals("Extremoz / RN", event.getLocale());
+        calendar.set(2020, 10, 10, 17, 1, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        assertEquals(calendar.getTime(), event.getTrackedAt());
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
     }
-    
+  }
+
+  @Test
+  public void testSetImplementation() {
     try {
-      TrackObject trackObject = Rastreio.trackSync("LB941561336SE");
-
-      assertNotNull(trackObject);
-      assertEquals("LB941561336SE", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.LB, trackObject.getServiceType());
-      assertEquals("LB", trackObject.getServiceType().getInitials());
-      assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
-          trackObject.getServiceType().getDescription());
-      assertTrue(trackObject.isValid());
-      assertTrue(!trackObject.isDelivered());
-      assertEquals(Error.NO_ERROR, trackObject.getError());
-      calendar.set(2020, 10, 27, 15, 2, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), trackObject.getPostedAt());
-      calendar.set(2020, 10, 27, 15, 22, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
-      assertNotNull(trackObject.getEvents());
-      assertEquals(2, trackObject.getEvents().size());
-      // First event
-      TrackObject.Event event = trackObject.getEvents().get(0);
-      assertNotNull(event);
-      assertEquals("Objeto postado", event.getDescription());
-      assertNull(event.getDetails());
-      assertEquals("SUECIA /", event.getLocale());
-      calendar.set(2020, 10, 27, 15, 2, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-      // Last event
-      event = trackObject.getEvents().get(1);
-      assertNotNull(event);
-      assertEquals("Objeto recebido na unidade de exportação no país de origem",
-          event.getDescription());
-      assertNull(event.getDetails());
-      assertEquals("SUECIA /", event.getLocale());
-      calendar.set(2020, 10, 27, 15, 22, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-    } catch (IOException e) {
+      Rastreio.setImplementation(null);
+
+      fail("Should have thrown NullPointerException");
+    } catch (NullPointerException e) {
+      assertTrue(true);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
 
     try {
-      TrackObject trackObject = Rastreio.trackSync("LB918031405SE");
-
-      assertNotNull(trackObject);
-      assertEquals("LB918031405SE", trackObject.getCode());
-      assertEquals(TrackObjectServiceType.LB, trackObject.getServiceType());
-      assertEquals("LB", trackObject.getServiceType().getInitials());
-      assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
-          trackObject.getServiceType().getDescription());
-      assertTrue(trackObject.isValid());
-      assertFalse(trackObject.isDelivered());
-      assertEquals(Error.NO_ERROR, trackObject.getError());
-      calendar.set(2020, 10, 16, 11, 56, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), trackObject.getPostedAt());
-      calendar.set(2020, 11, 1, 14, 59, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
-      assertNotNull(trackObject.getEvents());
-      assertEquals(6, trackObject.getEvents().size());
-      // First event
-      TrackObject.Event event = trackObject.getEvents().get(0);
-      assertNotNull(event);
-      assertEquals("Objeto postado", event.getDescription());
-      assertNull(event.getDetails());
-      assertEquals("SUECIA /", event.getLocale());
-      calendar.set(2020, 10, 16, 11, 56, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-      // Event with details
-      event = trackObject.getEvents().get(4);
-      assertNotNull(event);
-      assertEquals("Objeto em trânsito - por favor aguarde", event.getDescription());
-      assertEquals(
-          "de Unidade de Distribuição em CURITIBA / PR para Unidade de Tratamento em CAJAMAR / SP",
-          event.getDetails());
-      assertEquals("CURITIBA / PR", event.getLocale());
-      calendar.set(2020, 10, 30, 9, 55, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-      // Last event
-      event = trackObject.getEvents().get(5);
-      assertNotNull(event);
-      assertEquals("Objeto em trânsito - por favor aguarde", event.getDescription());
-      assertEquals(
-          "de Unidade de Tratamento em CAJAMAR / SP para Unidade de Tratamento em JABOATAO DOS "
-          + "GUARARAPES / PE",
-          event.getDetails());
-      assertEquals("CAJAMAR / SP", event.getLocale());
-      calendar.set(2020, 11, 1, 14, 59, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-    } catch (IOException e) {
+      Rastreio.setImplementation(new EnhancedImplementation());
+    } catch (Exception e) {
       fail(e.getMessage());
     }
 
     try {
-      TrackObject trackObject = Rastreio.trackSync("LB929795602SE");
-
-      assertNotNull(trackObject);
-      assertEquals("LB929795602SE", trackObject.getCode());
-      assertEquals("LB", trackObject.getServiceType().getInitials());
-      assertEquals("LOGÍSTICA REVERSA SIMULTÂNEA SEDEX",
-          trackObject.getServiceType().getDescription());
-      assertTrue(trackObject.isValid());
-      assertFalse(trackObject.isDelivered());
-      assertEquals(Error.NO_ERROR, trackObject.getError());
-      calendar.set(2020, 10, 15, 13, 26, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), trackObject.getPostedAt());
-      calendar.set(2020, 10, 15, 13, 49, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), trackObject.getUpdatedAt());
-      assertNotNull(trackObject.getEvents());
-      assertEquals(2, trackObject.getEvents().size());
-      // First event
-      TrackObject.Event event = trackObject.getEvents().get(0);
-      assertNotNull(event);
-      assertEquals("Objeto postado", event.getDescription());
-      assertNull(event.getDetails());
-      assertEquals("SUECIA /", event.getLocale());
-      calendar.set(2020, 10, 15, 13, 26, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-      // Last event
-      event = trackObject.getEvents().get(1);
-      assertNotNull(event);
-      assertEquals("Objeto recebido na unidade de exportação no país de origem",
-          event.getDescription());
-      assertNull(event.getDetails());
-      assertEquals("SUECIA /", event.getLocale());
-      calendar.set(2020, 10, 15, 13, 49, 0);
-      calendar.set(Calendar.MILLISECOND, 0);
-      assertEquals(calendar.getTime(), event.getTrackedAt());
-    } catch (IOException e) {
+      Rastreio.setImplementation(new DefaultImplementation());
+    } catch (Exception e) {
       fail(e.getMessage());
     }
   }
diff --git a/src/test/java/rastreio/Util.java b/src/test/java/rastreio/Util.java
index 09932c3..8f9f6a1 100644
--- a/src/test/java/rastreio/Util.java
+++ b/src/test/java/rastreio/Util.java
@@ -19,6 +19,7 @@ static MockWebServer setupMockWebServer() throws IOException, IllegalAccessExcep
 
     // Change Magic.URL to use server URL
     HijackMagic.changeUrl(server.url("").toString());
+    HijackMagic.changeUrl2(server.url("").toString());
 
     return server;
   }
@@ -33,6 +34,7 @@ static MockWebServer setupMockWebServerWithMockResponseFromFile(String filename)
 
     // Change Magic.URL to use server URL
     HijackMagic.changeUrl(server.url("").toString());
+    HijackMagic.changeUrl2(server.url("").toString());
 
     return server;
   }
@@ -58,6 +60,7 @@ static void tearDownMockWebServer(MockWebServer server, boolean skipRevertingMag
     // Revert Magic.URL back to original
     try {
       HijackMagic.revertUrl();
+      HijackMagic.revertUrl2();
     } catch (Exception e) {
       // Ignore exception
     }