diff --git a/pom.xml b/pom.xml
index 4ecb845..9fa7cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>2.1.9.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -39,6 +39,39 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.5.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+            <version>2.1.9.RELEASE</version>
+         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>2.1.9.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <version>2.1.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.23.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -51,5 +84,6 @@
                 </configuration>
             </plugin>
         </plugins>
+        <testSourceDirectory>${project.basedir}/src/test</testSourceDirectory>
     </build>
 </project>
diff --git a/src/main/java/org/nuvola/tvshowtime/ApplicationLauncher.java b/src/main/java/org/nuvola/tvshowtime/ApplicationLauncher.java
index fbded82..aa94a82 100644
--- a/src/main/java/org/nuvola/tvshowtime/ApplicationLauncher.java
+++ b/src/main/java/org/nuvola/tvshowtime/ApplicationLauncher.java
@@ -18,268 +18,27 @@
 
 package org.nuvola.tvshowtime;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.stream.Collectors;
-
-import org.nuvola.tvshowtime.business.plex.MediaContainer;
-import org.nuvola.tvshowtime.business.plex.User;
-import org.nuvola.tvshowtime.business.plex.Video;
-import org.nuvola.tvshowtime.business.tvshowtime.AccessToken;
-import org.nuvola.tvshowtime.business.tvshowtime.AuthorizationCode;
-import org.nuvola.tvshowtime.business.tvshowtime.Message;
-import org.nuvola.tvshowtime.config.PMSConfig;
-import org.nuvola.tvshowtime.config.TVShowTimeConfig;
-import org.nuvola.tvshowtime.util.DateUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.web.client.RestTemplate;
-
-import static org.nuvola.tvshowtime.util.Constants.MINUTE_IN_MILIS;
-import static org.nuvola.tvshowtime.util.Constants.PMS_WATCH_HISTORY;
-import static org.nuvola.tvshowtime.util.Constants.TVST_ACCESS_TOKEN_URI;
-import static org.nuvola.tvshowtime.util.Constants.TVST_AUTHORIZE_URI;
-import static org.nuvola.tvshowtime.util.Constants.TVST_CHECKIN_URI;
-import static org.nuvola.tvshowtime.util.Constants.TVST_CLIENT_ID;
-import static org.nuvola.tvshowtime.util.Constants.TVST_CLIENT_SECRET;
-import static org.nuvola.tvshowtime.util.Constants.TVST_RATE_REMAINING_HEADER;
-import static org.nuvola.tvshowtime.util.Constants.TVST_USER_AGENT;
-import static org.springframework.http.HttpMethod.POST;
 
 @SpringBootApplication
 @EnableScheduling
 public class ApplicationLauncher {
-    private static final Logger LOG = LoggerFactory.getLogger(ApplicationLauncher.class);
 
     @Autowired
-    private TVShowTimeConfig tvShowTimeConfig;
-    @Autowired
-    private PMSConfig pmsConfig;
-
-    private RestTemplate tvShowTimeTemplate;
-    private RestTemplate pmsTemplate;
-    private AccessToken accessToken;
-    private Timer tokenTimer;
-
-	public static void main(String[] args) {
-		SpringApplication.run(ApplicationLauncher.class, args);
-	}
-
-    @Scheduled(fixedDelay = Long.MAX_VALUE)
-	public void init() {
-        tvShowTimeTemplate = new RestTemplate();
+    private TvTimeService m_tvTimeService;
 
-        File storeToken = new File(tvShowTimeConfig.getTokenFile());
-        if (storeToken.exists()) {
-            try {
-                FileInputStream fileInputStream = new FileInputStream(storeToken);
-                ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream);
-                accessToken = (AccessToken) objectInputStream.readObject();
-                objectInputStream.close();
-                fileInputStream.close();
-
-                LOG.info("AccessToken loaded from file with success : " + accessToken);
-            } catch (Exception e) {
-                LOG.error("Error parsing the AccessToken stored in 'session_token'.");
-                LOG.error("Please remove the 'session_token' file, and try again.");
-                LOG.error(e.getMessage());
-
-                System.exit(1);
-            }
-
-            try {
-                processWatchedEpisodes();
-            } catch (Exception e) {
-                LOG.error("Error during marking episodes as watched.");
-                LOG.error(e.getMessage());
-
-                System.exit(1);
-            }
-        } else {
-            requestAccessToken();
-        }
+    public static void main(String[] args) {
+        SpringApplication.run(ApplicationLauncher.class, args);
     }
 
-    private void requestAccessToken() {
-        try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-            HttpEntity<String> entity = new HttpEntity<>("client_id=" + TVST_CLIENT_ID, headers);
-
-            ResponseEntity<AuthorizationCode> content = tvShowTimeTemplate.exchange(TVST_AUTHORIZE_URI, POST, entity,
-                    AuthorizationCode.class);
-            AuthorizationCode authorizationCode = content.getBody();
-
-            if (authorizationCode.getResult().equals("OK")) {
-                LOG.info("Linking with your TVShowTime account using the code " + authorizationCode.getDevice_code());
-                LOG.info("Please open the URL " + authorizationCode.getVerification_url() + " in your browser");
-                LOG.info("Connect with your TVShowTime account and type in the following code : ");
-                LOG.info(authorizationCode.getUser_code());
-                LOG.info("Waiting for you to type in the code in TVShowTime :-D ...");
-
-                tokenTimer = new Timer();
-                tokenTimer.scheduleAtFixedRate(new TimerTask() {
-                    @Override
-                    public void run() {
-                        loadAccessToken(authorizationCode.getDevice_code());
-                    }
-                }, 1000 * authorizationCode.getInterval(), 1000 * authorizationCode.getInterval());
-            } else {
-                LOG.error("OAuth authentication TVShowTime failed.");
-
-                System.exit(1);
-            }
-        } catch (Exception e) {
-            LOG.error("OAuth authentication TVShowTime failed.");
-            LOG.error(e.getMessage());
-
-            System.exit(1);
-        }
+    @EventListener(ApplicationReadyEvent.class)
+    public void init() throws Exception {
+        m_tvTimeService.init();
     }
 
-    private void loadAccessToken(String deviceCode) {
-        String query = new StringBuilder("client_id=")
-                .append(TVST_CLIENT_ID)
-                .append("&client_secret=")
-                .append(TVST_CLIENT_SECRET)
-                .append("&code=")
-                .append(deviceCode)
-                .toString();
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        HttpEntity<String> entity = new HttpEntity<>(query, headers);
-
-        ResponseEntity<AccessToken> content = tvShowTimeTemplate.exchange(TVST_ACCESS_TOKEN_URI, POST, entity,
-                AccessToken.class);
-        accessToken = content.getBody();
-
-        if (accessToken.getResult().equals("OK")) {
-            LOG.info("AccessToken from TVShowTime with success : " + accessToken);
-            tokenTimer.cancel();
-
-            storeAccessToken();
-            processWatchedEpisodes();
-        } else {
-            if (!accessToken.getMessage().equals("Authorization pending")
-                    && !accessToken.getMessage().equals("Slow down")) {
-                LOG.error("Unexpected error did arrive, please reload the service :-(");
-                tokenTimer.cancel();
-
-                System.exit(1);
-            }
-        }
-    }
-
-    private void storeAccessToken() {
-        try {
-            File storeToken = new File(tvShowTimeConfig.getTokenFile());
-            FileOutputStream fileOutputStream = new FileOutputStream(storeToken);
-            ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream);
-            objectOutputStream.writeObject(accessToken);
-            objectOutputStream.close();
-            fileOutputStream.close();
-
-            LOG.info("AccessToken store successfully inside a file...");
-        } catch (Exception e) {
-            LOG.error("Unexpected error did arrive when trying to store the AccessToken in a file ");
-            LOG.error(e.getMessage());
-
-            System.exit(1);
-        }
-    }
-
-    private void processWatchedEpisodes() {
-        pmsTemplate = new RestTemplate();
-        String watchHistoryUrl = pmsConfig.getPath() + PMS_WATCH_HISTORY;
-
-        if (pmsConfig.getToken() != null && !pmsConfig.getToken().isEmpty()) {
-            watchHistoryUrl += "?X-Plex-Token=" + pmsConfig.getToken();
-            LOG.info("Calling Plex with a X-Plex-Token...");
-        }
-
-        ResponseEntity<MediaContainer> response =  pmsTemplate.getForEntity(watchHistoryUrl, MediaContainer.class);
-        MediaContainer mediaContainer = response.getBody();
-
-        for (Video video : mediaContainer.getVideo()) {
-            LocalDateTime date = DateUtils.getDateTimeFromTimestamp(video.getViewedAt());
-
-            // Mark as watched only episodes for configured user
-            if (pmsConfig.getUsername() != null && video.getUser() != null) {
-                List<User> users = video.getUser().stream().filter(user -> user.getName().equals(pmsConfig.getUsername())).collect(Collectors.toList());
-
-                if (users.stream().count() == 0) {
-                    continue;
-                }
-            }
-
-            // Mark as watched only today and yesterday episodes
-            if (DateUtils.isTodayOrYesterday(date) || pmsConfig.getMarkall() == true) {
-                if (video.getType().equals("episode")) {
-                    String episode = new StringBuilder(video.getGrandparentTitle())
-                            .append(" - S")
-                            .append(video.getParentIndex())
-                            .append("E").append(video.getIndex())
-                            .toString();
-
-                    markEpisodeAsWatched(episode);
-                } else {
-                    continue;
-                }
-            } else {
-                LOG.info("All episodes are processed successfully ...");
-                System.exit(0);
-            }
-        }
-    }
-
-    private void markEpisodeAsWatched(String episode) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        headers.add("User-Agent", TVST_USER_AGENT);
-        HttpEntity<String> entity = new HttpEntity<>("filename=" + episode, headers);
-
-        String checkinUrl = new StringBuilder(TVST_CHECKIN_URI)
-                .append("?access_token=")
-                .append(accessToken.getAccess_token())
-                .toString();
-
-        ResponseEntity<Message> content = tvShowTimeTemplate.exchange(checkinUrl, POST, entity, Message.class);
-        Message message = content.getBody();
-
-        if (message.getResult().equals("OK")) {
-            LOG.info("Mark " + episode + " as watched in TVShowTime");
-        } else {
-            LOG.error("Error while marking [" + episode + "] as watched in TVShowTime ");
-        }
-
-        // Check if we are below the Rate-Limit of the API
-        int remainingApiCalls = Integer.parseInt(content.getHeaders().get(TVST_RATE_REMAINING_HEADER).get(0));
-        if (remainingApiCalls == 0) {
-            try {
-                LOG.info("Consumed all available TVShowTime API calls slots, waiting for new slots ...");
-                Thread.sleep(MINUTE_IN_MILIS);
-            } catch (Exception e) {
-                LOG.error(e.getMessage());
-
-                System.exit(1);
-            }
-        }
-    }
 }
diff --git a/src/main/java/org/nuvola/tvshowtime/PlexService.java b/src/main/java/org/nuvola/tvshowtime/PlexService.java
new file mode 100644
index 0000000..f6ba0e4
--- /dev/null
+++ b/src/main/java/org/nuvola/tvshowtime/PlexService.java
@@ -0,0 +1,102 @@
+package org.nuvola.tvshowtime;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.nuvola.tvshowtime.business.plex.MetaData;
+import org.nuvola.tvshowtime.business.plex.PlexResponse;
+import org.nuvola.tvshowtime.config.PMSConfig;
+import org.nuvola.tvshowtime.util.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.*;
+
+import static org.nuvola.tvshowtime.util.Constants.PMS_GET_ACCOUNTS;
+import static org.nuvola.tvshowtime.util.Constants.PMS_WATCH_HISTORY;
+
+@Service
+class PlexService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PlexService.class);
+
+    @Autowired
+    private PMSConfig pmsConfig;
+    @Autowired
+    private RestTemplate pmsTemplate;
+    private Map<String, Long> m_users = new HashMap<>();
+    private String m_url;
+    private final static ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    void getUsersInPlex() throws IOException {
+        m_url = pmsConfig.getPath() + PMS_GET_ACCOUNTS;
+        appendPlexToken();
+        LOG.debug("Get users from plex with url: " + m_url);
+        String response = pmsTemplate.getForObject(m_url, String.class);
+        PlexResponse plexResponse = OBJECT_MAPPER.readValue(response, PlexResponse.class);
+        plexResponse.getMediaContainer().getAccount().stream().filter(user -> !user.getName().equals("")).forEach(user -> m_users.put(user.getName(), user.getId()));
+    }
+
+    Map<String, Long> getUsers() {
+        return m_users;
+    }
+
+    Set<String> getWatchedOnPlex() throws IOException {
+        //refresh m_users
+        getUsersInPlex();
+
+        Set<String> watched = new HashSet<>();
+        m_url = pmsConfig.getPath() + PMS_WATCH_HISTORY;
+
+        appendPlexToken();
+        String response = pmsTemplate.getForObject(m_url, String.class);
+
+        PlexResponse plexResponse = OBJECT_MAPPER.readValue(response, PlexResponse.class);
+        LOG.debug(plexResponse.getMediaContainer().toString());
+
+        for (MetaData metaData : plexResponse.getMediaContainer().getMetaData()) {
+            LocalDateTime date = DateUtils.getDateTimeFromTimestamp(metaData.getViewedAt());
+
+            LOG.debug(metaData.toString());
+
+            // If present, mark as watched only episodes for configured user
+            if (pmsConfig.getUsername() != null) {
+                if (!metaData.getAccountID().equals(m_users.get(pmsConfig.getUsername()))) {
+                    continue;
+                }
+            }
+
+            // Mark as watched only today and yesterday episodes
+            if (DateUtils.isTodayOrYesterday(date) || pmsConfig.getMarkall()) {
+                if (metaData.getType().equals("episode")) {
+                    String episode = new StringBuilder(metaData.getGrandparentTitle())
+                            .append(" - S")
+                            .append(metaData.getParentIndex())
+                            .append("E").append(metaData.getIndex())
+                            .toString();
+
+                    watched.add(episode);
+                }
+                /*
+                 * Enable when TvTime should accept movie
+
+                else if (metaData.getType().equals("movie")) {
+                    watched.add(metaData.getTitle());
+                }
+                */
+            }
+        }
+        return watched;
+    }
+
+    private void appendPlexToken() {
+        if (pmsConfig.getToken() != null && !pmsConfig.getToken().isEmpty()) {
+            m_url += "?X-Plex-Token=" + pmsConfig.getToken();
+            LOG.debug("Calling Plex with a X-Plex-Token = " + pmsConfig.getToken());
+        }
+    }
+
+}
diff --git a/src/main/java/org/nuvola/tvshowtime/TvTimeService.java b/src/main/java/org/nuvola/tvshowtime/TvTimeService.java
new file mode 100644
index 0000000..fec70c0
--- /dev/null
+++ b/src/main/java/org/nuvola/tvshowtime/TvTimeService.java
@@ -0,0 +1,203 @@
+package org.nuvola.tvshowtime;
+
+import org.nuvola.tvshowtime.business.tvshowtime.*;
+import org.nuvola.tvshowtime.config.TVShowTimeConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.*;
+import java.util.*;
+
+import static org.nuvola.tvshowtime.util.Constants.*;
+import static org.springframework.http.HttpMethod.POST;
+
+@Service
+class TvTimeService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TvTimeService.class);
+
+    @Autowired
+    private TVShowTimeConfig tvShowTimeConfig;
+
+    @Autowired
+    private PlexService m_plexService;
+
+    @Autowired
+    private RestTemplate tvShowTimeTemplate;
+    private AccessToken accessToken;
+    private Timer tokenTimer;
+
+    void init() throws Exception {
+        File storeToken = new File(tvShowTimeConfig.getTokenFile());
+        if (storeToken.exists()) {
+            try {
+                FileInputStream fileInputStream = new FileInputStream(storeToken);
+                ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream);
+                accessToken = (AccessToken) objectInputStream.readObject();
+                objectInputStream.close();
+                fileInputStream.close();
+                LOG.info("AccessToken loaded from file with success : " + accessToken);
+            }
+            catch (Exception e) {
+                LOG.error("Error parsing the AccessToken stored in 'session_token'.");
+                LOG.error("Please remove the 'session_token' file, and try again.");
+                LOG.error(e.getMessage());
+                throw e;
+            }
+
+            try {
+                m_plexService.getUsersInPlex();
+                markEpisodesAsWatched(m_plexService.getWatchedOnPlex());
+                LOG.info("All episodes are processed successfully ...");
+            }
+            catch (Exception e) {
+                LOG.error("Error during marking episodes as watched.");
+                LOG.error("Error: ", e);
+                throw e;
+            }
+        }
+        else {
+            requestAccessToken();
+            LOG.info("Re-run the app to load info to TvTime ;-)");
+        }
+    }
+
+    void requestAccessToken() throws Exception {
+        LOG.info("RequestAccessToken....");
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        HttpEntity<String> entity = new HttpEntity<>("client_id=" + TVST_CLIENT_ID, headers);
+
+        ResponseEntity<AuthorizationCode> content = tvShowTimeTemplate.exchange(TVST_AUTHORIZE_URI, POST, entity,
+                AuthorizationCode.class);
+        AuthorizationCode authorizationCode = content.getBody();
+
+        if (authorizationCode != null && authorizationCode.getResult().equals("OK")) {
+            LOG.info("Linking with your TVShowTime account using the code " + authorizationCode.getDevice_code());
+            LOG.info("Please open the URL " + authorizationCode.getVerification_url() + " in your browser");
+            LOG.info("Connect with your TVShowTime account and type in the following code : ");
+            LOG.info(">>> INSERT THE FOLLOWING CODE: " + authorizationCode.getUser_code() + " <<<");
+            LOG.info("Waiting for you to type in the code in TVShowTime :-D ...");
+
+            tokenTimer = new Timer();
+            tokenTimer.scheduleAtFixedRate(new TimerTask() {
+                @Override
+                public void run() {
+                    try {
+                        loadAccessToken(authorizationCode.getDevice_code());
+                    }
+                    catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }, 1000 * authorizationCode.getInterval(), 1000 * authorizationCode.getInterval());
+        }
+        else {
+            throw new Exception("OAuth authentication TVShowTime failed.");
+        }
+    }
+
+    void loadAccessToken(String deviceCode) throws Exception {
+        String query = new StringBuilder("client_id=")
+                .append(TVST_CLIENT_ID)
+                .append("&client_secret=")
+                .append(TVST_CLIENT_SECRET)
+                .append("&code=")
+                .append(deviceCode)
+                .toString();
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        HttpEntity<String> entity = new HttpEntity<>(query, headers);
+
+        ResponseEntity<AccessToken> content = tvShowTimeTemplate.exchange(TVST_ACCESS_TOKEN_URI, POST, entity,
+                AccessToken.class);
+        accessToken = content.getBody();
+
+        if (accessToken == null) {
+            throw new Exception("Access token is null");
+        }
+
+        if (accessToken.getResult().equals("OK")) {
+            LOG.info("AccessToken from TVShowTime with success : " + accessToken);
+            tokenTimer.cancel();
+            storeAccessToken();
+            markEpisodesAsWatched(m_plexService.getWatchedOnPlex());
+        }
+        else {
+            if (!accessToken.getMessage().equals("Authorization pending")
+                    && !accessToken.getMessage().equals("Slow down")) {
+                LOG.error("Unexpected error did arrive, please reload the service :-(");
+                tokenTimer.cancel();
+                throw new Exception("Unexpected error did arrive, please reload the service :-(");
+            }
+        }
+    }
+
+    private void storeAccessToken() throws IOException {
+        try {
+            File storeToken = new File(tvShowTimeConfig.getTokenFile());
+            FileOutputStream fileOutputStream = new FileOutputStream(storeToken);
+            ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream);
+            objectOutputStream.writeObject(accessToken);
+            objectOutputStream.close();
+            fileOutputStream.close();
+            LOG.info("AccessToken store successfully inside a file...");
+        }
+        catch (Exception e) {
+            LOG.error("Unexpected error did arrive when trying to store the AccessToken in a file ");
+            LOG.error(e.getMessage());
+            throw e;
+        }
+    }
+
+    void markEpisodesAsWatched(Set<String> episodes) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.add("User-Agent", TVST_USER_AGENT);
+
+        String checkInUrl = new StringBuilder(TVST_CHECKIN_URI)
+                .append("?access_token=")
+                .append(accessToken.getAccess_token())
+                .toString();
+
+        for (String episode : episodes) {
+            HttpEntity<String> entity = new HttpEntity<>("filename=" + episode, headers);
+
+            ResponseEntity<Message> content = tvShowTimeTemplate.exchange(checkInUrl, POST, entity, Message.class);
+            Message message = content.getBody();
+
+            if (message != null && message.getResult().equals("OK")) {
+                LOG.info("Marked " + episode + " as watched in TVShowTime");
+            }
+            else {
+                LOG.error("Error while marking [" + episode + "] as watched in TVShowTime ");
+            }
+
+            // Check if we are below the Rate-Limit of the API
+            if (content.getHeaders().get(TVST_RATE_REMAINING_HEADER) != null
+                    && !content.getHeaders().get(TVST_RATE_REMAINING_HEADER).isEmpty()) {
+
+                int remainingApiCalls = Integer.parseInt(content.getHeaders().get(TVST_RATE_REMAINING_HEADER).get(0));
+                long epocNewRateLimit = (Long.valueOf(content.getHeaders().get(TVST_RATE_RESET_HEADER).get(0)) * 1000);
+                if (remainingApiCalls == 0) {
+                    try {
+                        LOG.info("Consumed all available TVShowTime API calls slots, waiting for new slots at " + epocNewRateLimit);
+                        epocNewRateLimit = epocNewRateLimit - System.currentTimeMillis();
+                        if (epocNewRateLimit > 0) {
+                            Thread.sleep(epocNewRateLimit);
+                        }
+                    }
+                    catch (Exception e) {
+                        LOG.error(e.getMessage());
+                    }
+                }
+
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/nuvola/tvshowtime/business/plex/Account.java b/src/main/java/org/nuvola/tvshowtime/business/plex/Account.java
new file mode 100644
index 0000000..7df2cfa
--- /dev/null
+++ b/src/main/java/org/nuvola/tvshowtime/business/plex/Account.java
@@ -0,0 +1,108 @@
+/*
+ * tvshowtimeplex
+ * Copyright (C) 2017  Appulize - Maciej Swic
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.nuvola.tvshowtime.business.plex;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "Account")
+public class Account {
+    private Long id;
+    private String key;
+    private String name;
+    private String defaultAudioLanguage;
+    private Boolean autoSelectAudio;
+    private String defaultSubtitleLanguage;
+    private Integer subtitleMode;
+    private String thumb;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getDefaultAudioLanguage() {
+        return defaultAudioLanguage;
+    }
+
+    public void setDefaultAudioLanguage(String defaultAudioLanguage) {
+        this.defaultAudioLanguage = defaultAudioLanguage;
+    }
+
+    public Boolean getAutoSelectAudio() {
+        return autoSelectAudio;
+    }
+
+    public void setAutoSelectAudio(Boolean autoSelectAudio) {
+        this.autoSelectAudio = autoSelectAudio;
+    }
+
+    public String getDefaultSubtitleLanguage() {
+        return defaultSubtitleLanguage;
+    }
+
+    public void setDefaultSubtitleLanguage(String defaultSubtitleLanguage) {
+        this.defaultSubtitleLanguage = defaultSubtitleLanguage;
+    }
+
+    public Integer getSubtitleMode() {
+        return subtitleMode;
+    }
+
+    public void setSubtitleMode(Integer subtitleMode) {
+        this.subtitleMode = subtitleMode;
+    }
+
+    public String getThumb() {
+        return thumb;
+    }
+
+    public void setThumb(String thumb) {
+        this.thumb = thumb;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonProperty("title")
+    public String getTitle() {
+        return name;
+    }
+
+    public void setTitle(String title) {
+        this.name = title;
+    }
+}
diff --git a/src/main/java/org/nuvola/tvshowtime/business/plex/MediaContainer.java b/src/main/java/org/nuvola/tvshowtime/business/plex/MediaContainer.java
index 50ad752..1d2ede5 100644
--- a/src/main/java/org/nuvola/tvshowtime/business/plex/MediaContainer.java
+++ b/src/main/java/org/nuvola/tvshowtime/business/plex/MediaContainer.java
@@ -18,17 +18,22 @@
 
 package org.nuvola.tvshowtime.business.plex;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
 import java.util.List;
 
 @XmlRootElement(name = "MediaContainer")
 public class MediaContainer {
+    @JsonProperty("size")
     private Integer size;
-    private List<Video> video;
+    private String identifier;
+    @JsonProperty("Metadata")
+    private List<MetaData> metaData;
+    @JsonProperty("Account")
+    private List<Account> account = new ArrayList<>();
 
-    @XmlAttribute(name="size")
     public Integer getSize() {
         return size;
     }
@@ -37,12 +42,28 @@ public void setSize(Integer size) {
         this.size = size;
     }
 
-    @XmlElement(name = "Video")
-    public List<Video> getVideo() {
-        return video;
+    public List<MetaData> getMetaData() {
+        return metaData;
+    }
+
+    public void setMetaData(List<MetaData> metaData) {
+        this.metaData = metaData;
+    }
+
+    public List<Account> getAccount() {
+        return account;
     }
 
-    public void setVideo(List<Video> video) {
-        this.video = video;
+    public void setAccount(List<Account> account) {
+        this.account = account;
     }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
 }
diff --git a/src/main/java/org/nuvola/tvshowtime/business/plex/MetaData.java b/src/main/java/org/nuvola/tvshowtime/business/plex/MetaData.java
new file mode 100644
index 0000000..ffdfc34
--- /dev/null
+++ b/src/main/java/org/nuvola/tvshowtime/business/plex/MetaData.java
@@ -0,0 +1,195 @@
+/*
+ * tvshowtimeplex
+ * Copyright (C) 2016  Nuvola - Mrabti Idriss
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.nuvola.tvshowtime.business.plex;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Date;
+
+@XmlRootElement(name = "Video")
+public class MetaData {
+
+    @XmlAttribute(name = "grandparentTitle")
+    private String grandparentTitle;
+    @XmlAttribute(name = "parentIndex")
+    private Integer parentIndex;
+    @XmlAttribute(name = "index")
+    private Integer index;
+    @XmlAttribute(name = "viewedAt")
+    private Long viewedAt;
+    @XmlAttribute(name = "type")
+    private String type;
+    @XmlAttribute(name = "title")
+    private String title;
+    @XmlAttribute(name = "accountID")
+    private Long accountID;
+
+    private String key;
+    private String parentKey;
+    private String grandparentKey;
+    private String thumb;
+    private String grandparentThumb;
+    private String grandparentArt;
+    private Date originallyAvailableAt;
+    private Integer deviceID;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getParentKey() {
+        return parentKey;
+    }
+
+    public void setParentKey(String parentKey) {
+        this.parentKey = parentKey;
+    }
+
+    public String getGrandparentKey() {
+        return grandparentKey;
+    }
+
+    public void setGrandparentKey(String grandparentKey) {
+        this.grandparentKey = grandparentKey;
+    }
+
+    public String getThumb() {
+        return thumb;
+    }
+
+    public void setThumb(String thumb) {
+        this.thumb = thumb;
+    }
+
+    public String getParentThumb() {
+        return parentThumb;
+    }
+
+    public void setParentThumb(String parentThumb) {
+        this.parentThumb = parentThumb;
+    }
+
+    public String getGrandparentThumb() {
+        return grandparentThumb;
+    }
+
+    public void setGrandparentThumb(String grandparentThumb) {
+        this.grandparentThumb = grandparentThumb;
+    }
+
+    public String getGrandparentArt() {
+        return grandparentArt;
+    }
+
+    public void setGrandparentArt(String grandparentArt) {
+        this.grandparentArt = grandparentArt;
+    }
+
+    public Date getOriginallyAvailableAt() {
+        return originallyAvailableAt;
+    }
+
+    public void setOriginallyAvailableAt(Date originallyAvailableAt) {
+        this.originallyAvailableAt = originallyAvailableAt;
+    }
+
+    public Integer getDeviceID() {
+        return deviceID;
+    }
+
+    public void setDeviceID(Integer deviceID) {
+        this.deviceID = deviceID;
+    }
+
+    private String parentThumb;
+
+
+    public String getGrandparentTitle() {
+        return grandparentTitle;
+    }
+
+    public void setGrandparentTitle(String grandparentTitle) {
+        this.grandparentTitle = grandparentTitle;
+    }
+
+    public Integer getParentIndex() {
+        return parentIndex;
+    }
+
+    public void setParentIndex(Integer parentIndex) {
+        this.parentIndex = parentIndex;
+    }
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+
+    public Long getViewedAt() {
+        return viewedAt;
+    }
+
+    public void setViewedAt(Long viewedAt) {
+        this.viewedAt = viewedAt;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Long getAccountID() {
+        return accountID;
+    }
+
+    public void setAccountID(Long accountID) {
+        this.accountID = accountID;
+    }
+
+    @Override
+    public String toString() {
+        return "Video={" +
+                "grandparentTitle=" + grandparentTitle +
+                ", parentIndex=" + parentIndex +
+                ", index=" + index +
+                ", viewedAt=" + viewedAt +
+                ", type=" + type +
+                ", title=" + title +
+                ", accountID=" + accountID +
+                "}";
+    }
+}
diff --git a/src/main/java/org/nuvola/tvshowtime/business/plex/User.java b/src/main/java/org/nuvola/tvshowtime/business/plex/PlexResponse.java
similarity index 58%
rename from src/main/java/org/nuvola/tvshowtime/business/plex/User.java
rename to src/main/java/org/nuvola/tvshowtime/business/plex/PlexResponse.java
index 6573bef..139acda 100644
--- a/src/main/java/org/nuvola/tvshowtime/business/plex/User.java
+++ b/src/main/java/org/nuvola/tvshowtime/business/plex/PlexResponse.java
@@ -1,6 +1,6 @@
 /*
  * tvshowtimeplex
- * Copyright (C) 2017  Appulize - Maciej Swic
+ * Copyright (C) 2019  AScuderoni
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,29 +18,19 @@
 
 package org.nuvola.tvshowtime.business.plex;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
-@XmlRootElement(name = "User")
-public class User {
-    private Long id;
-    private String name;
+public class PlexResponse {
 
-    @XmlAttribute(name="id")
-    public Long getId() {
-        return id;
-    }
+    @JsonProperty("MediaContainer")
+    private MediaContainer m_mediaContainer;
 
-    public void setId(Long id) {
-        this.id = id;
+    public MediaContainer getMediaContainer() {
+        return m_mediaContainer;
     }
 
-    @XmlAttribute(name="title")
-    public String getName() {
-        return name;
+    public void setMediaContainer(MediaContainer mediaContainer) {
+        m_mediaContainer = mediaContainer;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/src/main/java/org/nuvola/tvshowtime/business/plex/Video.java b/src/main/java/org/nuvola/tvshowtime/business/plex/Video.java
deleted file mode 100644
index eca9e25..0000000
--- a/src/main/java/org/nuvola/tvshowtime/business/plex/Video.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * tvshowtimeplex
- * Copyright (C) 2016  Nuvola - Mrabti Idriss
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.nuvola.tvshowtime.business.plex;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "Video")
-public class Video {
-    private String grandparentTitle;
-    private Integer parentIndex;
-    private Integer index;
-    private Long viewedAt;
-    private String type;
-    private List<User> user;
-
-    @XmlAttribute(name="grandparentTitle")
-    public String getGrandparentTitle() {
-        return grandparentTitle;
-    }
-
-    public void setGrandparentTitle(String grandparentTitle) {
-        this.grandparentTitle = grandparentTitle;
-    }
-
-    @XmlAttribute(name="parentIndex")
-    public Integer getParentIndex() {
-        return parentIndex;
-    }
-
-    public void setParentIndex(Integer parentIndex) {
-        this.parentIndex = parentIndex;
-    }
-
-    @XmlAttribute(name="index")
-    public Integer getIndex() {
-        return index;
-    }
-
-    public void setIndex(Integer index) {
-        this.index = index;
-    }
-
-    @XmlAttribute(name="viewedAt")
-    public Long getViewedAt() {
-        return viewedAt;
-    }
-
-    public void setViewedAt(Long viewedAt) {
-        this.viewedAt = viewedAt;
-    }
-
-    @XmlAttribute(name="type")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @XmlElement(name = "User")
-    public List<User> getUser() {
-        return user;
-    }
-
-    public void setUser(List<User> user) {
-        this.user = user;
-    }
-}
diff --git a/src/main/java/org/nuvola/tvshowtime/config/AppConfig.java b/src/main/java/org/nuvola/tvshowtime/config/AppConfig.java
new file mode 100644
index 0000000..4d2dbd2
--- /dev/null
+++ b/src/main/java/org/nuvola/tvshowtime/config/AppConfig.java
@@ -0,0 +1,16 @@
+package org.nuvola.tvshowtime.config;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+@ComponentScan(basePackages = {"org.nuvola"})
+@SpringBootApplication
+class AppConfig {
+
+    @Bean
+    public RestTemplate getRestTemplate(){
+        return new RestTemplate();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/nuvola/tvshowtime/util/Constants.java b/src/main/java/org/nuvola/tvshowtime/util/Constants.java
index fee9ffa..5ff6e33 100644
--- a/src/main/java/org/nuvola/tvshowtime/util/Constants.java
+++ b/src/main/java/org/nuvola/tvshowtime/util/Constants.java
@@ -23,12 +23,12 @@ public class Constants {
     public static final String TVST_CLIENT_SECRET = "ZHYcO8n8h6WbYuMDWVgXr7T571ZF_s1r1Rzu1-3B";
     public static final String TVST_USER_AGENT = "tvshowtime-plex";
     public static final String TVST_RATE_REMAINING_HEADER = "X-RateLimit-Remaining";
-    public static final String TVST_AUTHORIZE_URI = "https://api.tvshowtime.com/v1/oauth/device/code";
-    public static final String TVST_ACCESS_TOKEN_URI = "https://api.tvshowtime.com/v1/oauth/access_token";
-    public static final String TVST_CHECKIN_URI = "https://api.tvshowtime.com/v1/checkin";
+    public static final String TVST_RATE_RESET_HEADER = "X-RateLimit-Reset";
+    public static final String TVST_AUTHORIZE_URI = "https://api.tvtime.com/v1/oauth/device/code";
+    public static final String TVST_ACCESS_TOKEN_URI = "https://api.tvtime.com/v1/oauth/access_token";
+    public static final String TVST_CHECKIN_URI = "https://api.tvtime.com/v1/checkin";
 
     public static final String PMS_WATCH_HISTORY = "/status/sessions/history/all";
+    public static final String PMS_GET_ACCOUNTS = "/accounts";
 
-    public static final Long SECOND_IN_MILIS = 1000L;
-    public static final Long MINUTE_IN_MILIS = SECOND_IN_MILIS * 60;
 }
diff --git a/src/main/java/org/nuvola/tvshowtime/util/DateUtils.java b/src/main/java/org/nuvola/tvshowtime/util/DateUtils.java
index a7bcfd6..13a4fd7 100644
--- a/src/main/java/org/nuvola/tvshowtime/util/DateUtils.java
+++ b/src/main/java/org/nuvola/tvshowtime/util/DateUtils.java
@@ -19,7 +19,6 @@
 package org.nuvola.tvshowtime.util;
 
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.TimeZone;
 
@@ -28,13 +27,12 @@
 public class DateUtils {
     public static LocalDateTime getDateTimeFromTimestamp(long timestamp) {
         if (timestamp == 0) {
-            return null;
+            timestamp = 1L;
         }
-
         return ofInstant(Instant.ofEpochSecond(timestamp), TimeZone.getDefault().toZoneId());
     }
 
-    public static LocalDateTime getDateTime() {
+    private static LocalDateTime getDateTime() {
         return ofInstant(Instant.now(), TimeZone.getDefault().toZoneId());
     }
 
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
index ad993e7..72c9a06 100644
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
@@ -5,5 +5,5 @@
   | |\ V //\__/ / | | | (_) \ V  V /| | | | | | | | |  __/      | |   | |  __/>  <
   \_/ \_/ \____/|_| |_|\___/ \_/\_/ \_/ |_|_| |_| |_|\___|      \_|   |_|\___/_/\_\
 
-   :::  TVShowTime-Plex (V1.0.5)  :::
+   :::  TVShowTime-Plex (V1.0.6)  :::
 
diff --git a/src/test/org/nuvola/tvshowtime/PlexServiceTest.java b/src/test/org/nuvola/tvshowtime/PlexServiceTest.java
new file mode 100644
index 0000000..baa12ae
--- /dev/null
+++ b/src/test/org/nuvola/tvshowtime/PlexServiceTest.java
@@ -0,0 +1,218 @@
+package org.nuvola.tvshowtime;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.*;
+import org.nuvola.tvshowtime.config.PMSConfig;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.*;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withServerError;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
+public class PlexServiceTest extends TestBase {
+
+    @Spy
+    private PMSConfig m_pmsConfig;
+
+    @Spy
+    private RestTemplate m_restTemplate = new RestTemplate();
+
+    @Spy
+    @InjectMocks
+    private PlexService m_plexService;
+
+    private MockRestServiceServer mockServer = MockRestServiceServer.createServer(m_restTemplate);
+
+    @Before
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void getUsersFromPlex() throws IOException {
+
+        String accounts = readFile("accounts.json");
+
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(accounts, MediaType.APPLICATION_JSON));
+
+        m_plexService.getUsersInPlex();
+
+        assertThat("Users is not empty", !m_plexService.getUsers().isEmpty());
+        assertNotNull("User admin should exist", m_plexService.getUsers().get("admin"));
+        assertThat("User admin Map has key value 1", m_plexService.getUsers().get("admin").equals(1L));
+        assertNotNull("User FirstUser should exist", m_plexService.getUsers().get("FirstUser"));
+        assertThat("User FirstUser Map has key value 2", m_plexService.getUsers().get("FirstUser").equals(2L));
+        assertNotNull("User SecondUser should exist", m_plexService.getUsers().get("SecondUser"));
+        assertThat("User SecondUser Map has key value 3", m_plexService.getUsers().get("SecondUser").equals(3L));
+    }
+
+    @Test(expected = HttpServerErrorException.class)
+    public void getUsersFromPlexFailed() throws IOException {
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withServerError());
+
+        m_plexService.getUsersInPlex();
+    }
+
+    @Test
+    public void getWatchedEpisodesForToday() throws IOException {
+        Set<String> expectation = new HashSet<>(
+                Arrays.asList("Marvel's Agent Carter - S1E6",
+                        "Marvel's Agent Carter - S1E8",
+                        "Marvel's Agent Carter - S1E7")
+        );
+
+        String accounts = readFile("accounts.json");
+        String metadata = readFile("metadata_2.json");
+        String currentTime = String.valueOf(System.currentTimeMillis());
+        metadata = metadata.replaceAll("SYSDATE", currentTime.substring(0, currentTime.length() - 3));
+
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(accounts, MediaType.APPLICATION_JSON));
+
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/status/sessions/history/all?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(metadata, MediaType.APPLICATION_JSON));
+
+        Set<String> episodes = m_plexService.getWatchedOnPlex();
+
+        assertEquals(expectation, episodes);
+    }
+
+    @Test
+    public void getWatchedEpisodesWithMarkAll() throws IOException {
+        Set<String> expectation = new HashSet<>(
+                Arrays.asList(
+                        "Marvel's Agent Carter - S1E1",
+                        "Marvel's Agent Carter - S1E6",
+                        "Marvel's Agent Carter - S1E8",
+                        "Marvel's Agent Carter - S1E7"
+                )
+        );
+
+        String accounts = readFile("accounts.json");
+        String metadata = readFile("metadata_2.json");
+        String currentTime = String.valueOf(System.currentTimeMillis());
+        metadata = metadata.replaceAll("SYSDATE", currentTime.substring(0, currentTime.length() - 3));
+
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(accounts, MediaType.APPLICATION_JSON));
+
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        when(m_pmsConfig.getMarkall()).thenReturn(true);
+        mockServer.expect(requestTo("http://serveripport/status/sessions/history/all?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(metadata, MediaType.APPLICATION_JSON));
+
+        Set<String> episodes = m_plexService.getWatchedOnPlex();
+
+        assertEquals(expectation, episodes);
+    }
+
+    @Test
+    public void getWatchedEpisodesForTodayForAdminUser() throws IOException {
+        Set<String> expectation = new HashSet<>(
+                Arrays.asList("Marvel's Agent Carter - S1E6",
+                        "Marvel's Agent Carter - S1E8")
+        );
+
+        String metadata = readFile("metadata_2.json");
+        String currentTime = String.valueOf(System.currentTimeMillis());
+        metadata = metadata.replaceAll("SYSDATE", currentTime.substring(0, currentTime.length() - 3));
+        String accounts = readFile("accounts.json");
+
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(accounts, MediaType.APPLICATION_JSON));
+
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        when(m_pmsConfig.getUsername()).thenReturn("admin");
+        mockServer.expect(requestTo("http://serveripport/status/sessions/history/all?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(metadata, MediaType.APPLICATION_JSON));
+
+        Set<String> episodes = m_plexService.getWatchedOnPlex();
+
+        assertEquals(expectation, episodes);
+    }
+
+    @Test
+    public void getWatchedEpisodesForAdminUserWithMarkAll() throws IOException {
+        Set<String> expectation = new HashSet<>(
+                Arrays.asList(
+                        "Marvel's Agent Carter - S1E1",
+                        "Marvel's Agent Carter - S1E6",
+                        "Marvel's Agent Carter - S1E8")
+        );
+
+        String accounts = readFile("accounts.json");
+        String metadata = readFile("metadata_2.json");
+        String currentTime = String.valueOf(System.currentTimeMillis());
+        metadata = metadata.replaceAll("SYSDATE", currentTime.substring(0, currentTime.length() - 3));
+
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(accounts, MediaType.APPLICATION_JSON));
+
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        when(m_pmsConfig.getUsername()).thenReturn("admin");
+        when(m_pmsConfig.getMarkall()).thenReturn(true);
+        mockServer.expect(requestTo("http://serveripport/status/sessions/history/all?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(metadata, MediaType.APPLICATION_JSON));
+
+        Set<String> episodes = m_plexService.getWatchedOnPlex();
+
+        assertEquals(expectation, episodes);
+    }
+
+    @Test
+    public void getWatchedEpisodesForTodayForDifferentUser() throws IOException {
+        Set<String> expectation = new HashSet<>(
+                Collections.singletonList("Marvel's Agent Carter - S1E7")
+        );
+
+        String accounts = readFile("accounts.json");
+        String metadata = readFile("metadata_2.json");
+        String currentTime = String.valueOf(System.currentTimeMillis());
+        metadata = metadata.replaceAll("SYSDATE", currentTime.substring(0, currentTime.length() - 3));
+
+        when(m_pmsConfig.getToken()).thenReturn("TokenPlex");
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        mockServer.expect(requestTo("http://serveripport/accounts?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(accounts, MediaType.APPLICATION_JSON));
+
+        when(m_pmsConfig.getPath()).thenReturn("http://serveripport");
+        when(m_pmsConfig.getUsername()).thenReturn("FirstUser");
+        mockServer.expect(requestTo("http://serveripport/status/sessions/history/all?X-Plex-Token=TokenPlex"))
+                .andRespond(withSuccess(metadata, MediaType.APPLICATION_JSON));
+
+        Set<String> episodes = m_plexService.getWatchedOnPlex();
+
+        assertEquals(expectation, episodes);
+    }
+}
diff --git a/src/test/org/nuvola/tvshowtime/TestBase.java b/src/test/org/nuvola/tvshowtime/TestBase.java
new file mode 100644
index 0000000..c358ab4
--- /dev/null
+++ b/src/test/org/nuvola/tvshowtime/TestBase.java
@@ -0,0 +1,23 @@
+package org.nuvola.tvshowtime;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.stream.Stream;
+
+class TestBase {
+
+    static String readFile(String filePath) {
+        Path resourceDirectory = Paths.get("src", "test", "resources");
+        String absolutePath = resourceDirectory.toFile().getAbsolutePath();
+
+        StringBuilder contentBuilder = new StringBuilder();
+        try (Stream<String> stream = Files.lines(Paths.get(absolutePath + "/" + filePath), StandardCharsets.UTF_8)) {
+            stream.forEach(s -> contentBuilder.append(s).append("\n"));
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        return contentBuilder.toString();
+    }
+}
diff --git a/src/test/org/nuvola/tvshowtime/TvTimeServiceTest.java b/src/test/org/nuvola/tvshowtime/TvTimeServiceTest.java
new file mode 100644
index 0000000..d0401c1
--- /dev/null
+++ b/src/test/org/nuvola/tvshowtime/TvTimeServiceTest.java
@@ -0,0 +1,135 @@
+package org.nuvola.tvshowtime;
+
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.*;
+import org.nuvola.tvshowtime.business.tvshowtime.AccessToken;
+import org.nuvola.tvshowtime.config.TVShowTimeConfig;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.*;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.*;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.client.ExpectedCount.times;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
+public class TvTimeServiceTest extends TestBase {
+
+    @Spy
+    private RestTemplate m_restTemplate = new RestTemplate();
+
+    @Spy
+    private AccessToken m_accessToken;
+
+    @Spy
+    private Timer m_timer;
+
+    @Spy
+    private TVShowTimeConfig m_tvShowTimeConfig;
+
+    @Mock
+    private PlexService m_plexService;
+
+    @Spy
+    @InjectMocks
+    private TvTimeService m_tvTimeService;
+    private MockRestServiceServer mockServer = MockRestServiceServer.createServer(m_restTemplate);
+
+    @Before
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void testRequestAccessToken() throws Exception {
+        String tvTimeResponse = readFile("tvtime_request_device_code.json");
+
+        mockServer.expect(requestTo("https://api.tvtime.com/v1/oauth/device/code"))
+                .andRespond(withSuccess(tvTimeResponse, MediaType.APPLICATION_JSON));
+
+        m_tvTimeService.requestAccessToken();
+    }
+
+    @Test
+    public void markEpisodeEmptySet() {
+        when(m_accessToken.getAccess_token()).thenReturn("TokenTvTime");
+
+        m_tvTimeService.markEpisodesAsWatched(Collections.emptySet());
+    }
+
+    @Test
+    public void markEpisode() {
+        String tvTimeResponse = readFile("tvtime_episode_not_found.json");
+
+        Set<String> episodes = new HashSet<>(Arrays.asList("episode1", "episode2"));
+
+        when(m_accessToken.getAccess_token()).thenReturn("TokenTvTime");
+        mockServer.expect(times(2),
+                requestTo("https://api.tvtime.com/v1/checkin?access_token=TokenTvTime"))
+                .andRespond(withSuccess(tvTimeResponse, MediaType.APPLICATION_JSON));
+
+        m_tvTimeService.markEpisodesAsWatched(episodes);
+    }
+
+    @Test
+    public void markEpisodeSuccess() {
+        String tvTimeResponse = readFile("tvtime_ok_response.json");
+
+        Set<String> episodes = new HashSet<>(Arrays.asList("episode1", "episode2"));
+
+        when(m_accessToken.getAccess_token()).thenReturn("TokenTvTime");
+        mockServer.expect(times(2),
+                requestTo("https://api.tvtime.com/v1/checkin?access_token=TokenTvTime"))
+                .andRespond(withSuccess(tvTimeResponse, MediaType.APPLICATION_JSON));
+
+        m_tvTimeService.markEpisodesAsWatched(episodes);
+    }
+
+    @Test
+    public void markEpisodeTestRateLimit() {
+        String tv_rateLimit = readFile("tvtime_rate_limit_exceeded.json");
+        String tvTimeResponse = readFile("tvtime_ok_response.json");
+
+        Set<String> episodes = new HashSet<>(Arrays.asList("episode1", "episode2"));
+
+        long reset = System.currentTimeMillis();
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("X-RateLimit-Limit", "10");
+        headers.set("X-RateLimit-Remaining", "0");
+        headers.set("X-RateLimit-Reset", Long.toString((reset / 1000) + 15));
+        headers.set(HttpHeaders.CONTENT_TYPE, String.valueOf(MediaType.APPLICATION_JSON));
+        mockServer.expect(times(2), requestTo("https://api.tvtime.com/v1/checkin?access_token=TokenTvTime"))
+                .andRespond(withStatus(HttpStatus.OK).headers(headers).body(tvTimeResponse));
+
+        when(m_accessToken.getAccess_token()).thenReturn("TokenTvTime");
+
+        m_tvTimeService.markEpisodesAsWatched(episodes);
+    }
+
+    @Test
+    public void loadAccessToken() throws Exception {
+        String tvTimeResponse = readFile("tvtime_access_token.json");
+
+        when(m_accessToken.getAccess_token()).thenReturn("TokenTvTime");
+        when(m_tvShowTimeConfig.getTokenFile()).thenReturn("TokenFile");
+
+        mockServer.expect(requestTo("https://api.tvtime.com/v1/oauth/access_token"))
+                .andRespond(withSuccess(tvTimeResponse, MediaType.APPLICATION_JSON));
+
+
+        m_tvTimeService.loadAccessToken("tok");
+
+        verify(m_plexService).getWatchedOnPlex();
+    }
+
+}
diff --git a/src/test/resources/accounts.json b/src/test/resources/accounts.json
new file mode 100644
index 0000000..323e521
--- /dev/null
+++ b/src/test/resources/accounts.json
@@ -0,0 +1,48 @@
+{
+  "MediaContainer": {
+    "size": 4,
+    "identifier": "com.plexapp.system.accounts",
+    "Account": [
+      {
+        "id": 0,
+        "key": "/accounts/0",
+        "name": "",
+        "defaultAudioLanguage": "en",
+        "autoSelectAudio": true,
+        "defaultSubtitleLanguage": "en",
+        "subtitleMode": 1,
+        "thumb": ""
+      },
+      {
+        "id": 1,
+        "key": "/accounts/1",
+        "name": "admin",
+        "defaultAudioLanguage": "en",
+        "autoSelectAudio": true,
+        "defaultSubtitleLanguage": "en",
+        "subtitleMode": 1,
+        "thumb": ""
+      },
+      {
+        "id": 2,
+        "key": "/accounts/2",
+        "name": "FirstUser",
+        "defaultAudioLanguage": "en",
+        "autoSelectAudio": true,
+        "defaultSubtitleLanguage": "en",
+        "subtitleMode": 1,
+        "thumb": ""
+      },
+      {
+        "id": 3,
+        "key": "/accounts/3",
+        "name": "SecondUser",
+        "defaultAudioLanguage": "en",
+        "autoSelectAudio": true,
+        "defaultSubtitleLanguage": "en",
+        "subtitleMode": 1,
+        "thumb": ""
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/metadata_2.json b/src/test/resources/metadata_2.json
new file mode 100644
index 0000000..557a1a3
--- /dev/null
+++ b/src/test/resources/metadata_2.json
@@ -0,0 +1,89 @@
+{
+  "MediaContainer": {
+    "size": 4,
+    "Metadata": [
+      {
+        "key": "/library/metadata/8",
+        "parentKey": "/library/metadata/2",
+        "grandparentKey": "/library/metadata/1",
+        "title": "Un peccato sbagliare",
+        "grandparentTitle": "Marvel's Agent Carter",
+        "type": "episode",
+        "thumb": "/library/metadata/8/thumb/-1",
+        "parentThumb": "/library/metadata/2/thumb/1568358370",
+        "grandparentThumb": "/library/metadata/1/thumb/1568358468",
+        "grandparentArt": "/library/metadata/1/art/1568358468",
+        "index": 6,
+        "parentIndex": 1,
+        "originallyAvailableAt": "2015-02-10",
+        "viewedAt": SYSDATE,
+        "accountID": 1,
+        "deviceID": 4
+      },
+      {
+        "key": "/library/metadata/9",
+        "parentKey": "/library/metadata/2",
+        "grandparentKey": "/library/metadata/1",
+        "title": "L'apparenza inganna",
+        "grandparentTitle": "Marvel's Agent Carter",
+        "type": "episode",
+        "thumb": "/library/metadata/9/thumb/-1",
+        "parentThumb": "/library/metadata/2/thumb/1568358370",
+        "grandparentThumb": "/library/metadata/1/thumb/1568358468",
+        "grandparentArt": "/library/metadata/1/art/1568358468",
+        "index": 7,
+        "parentIndex": 1,
+        "originallyAvailableAt": "2015-02-17",
+        "viewedAt": SYSDATE,
+        "accountID": 2,
+        "deviceID": 4
+      },
+      {
+        "key": "/library/metadata/10",
+        "parentKey": "/library/metadata/2",
+        "grandparentKey": "/library/metadata/1",
+        "title": "Commiato",
+        "grandparentTitle": "Marvel's Agent Carter",
+        "type": "episode",
+        "thumb": "/library/metadata/10/thumb/-1",
+        "parentThumb": "/library/metadata/2/thumb/1568358370",
+        "grandparentThumb": "/library/metadata/1/thumb/1568358468",
+        "grandparentArt": "/library/metadata/1/art/1568358468",
+        "index": 8,
+        "parentIndex": 1,
+        "originallyAvailableAt": "2015-02-24",
+        "viewedAt": SYSDATE,
+        "accountID": 1,
+        "deviceID": 4
+      },
+      {
+        "key": "/library/metadata/3",
+        "parentKey": "/library/metadata/2",
+        "grandparentKey": "/library/metadata/1",
+        "title": "Questa non è la fine",
+        "grandparentTitle": "Marvel's Agent Carter",
+        "type": "episode",
+        "thumb": "/library/metadata/3/thumb/-1",
+        "parentThumb": "/library/metadata/2/thumb/1568358370",
+        "grandparentThumb": "/library/metadata/1/thumb/1568358468",
+        "grandparentArt": "/library/metadata/1/art/1568358468",
+        "index": 1,
+        "parentIndex": 1,
+        "originallyAvailableAt": "2015-01-06",
+        "viewedAt": 1568462280,
+        "accountID": 1,
+        "deviceID": 9
+      },
+      {
+        "key": "/library/metadata/1349",
+        "title": "Un sacco bello",
+        "type": "movie",
+        "thumb": "/library/metadata/1349/thumb/-1",
+        "originallyAvailableAt": "1980-01-19",
+        "viewedAt": SYSDATE,
+        "accountID": 1,
+        "deviceID": 4
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/tvtime_access_token.json b/src/test/resources/tvtime_access_token.json
new file mode 100644
index 0000000..58b9e0d
--- /dev/null
+++ b/src/test/resources/tvtime_access_token.json
@@ -0,0 +1,4 @@
+{
+  "access_token": "2343",
+  "result": "OK"
+}
\ No newline at end of file
diff --git a/src/test/resources/tvtime_episode_not_found.json b/src/test/resources/tvtime_episode_not_found.json
new file mode 100644
index 0000000..82a9ba7
--- /dev/null
+++ b/src/test/resources/tvtime_episode_not_found.json
@@ -0,0 +1,4 @@
+{
+    "result": "KO",
+    "message": "Unknown episode"
+}
\ No newline at end of file
diff --git a/src/test/resources/tvtime_ok_response.json b/src/test/resources/tvtime_ok_response.json
new file mode 100644
index 0000000..63fda27
--- /dev/null
+++ b/src/test/resources/tvtime_ok_response.json
@@ -0,0 +1,3 @@
+{
+  "result": "OK"
+}
\ No newline at end of file
diff --git a/src/test/resources/tvtime_rate_limit_exceeded.json b/src/test/resources/tvtime_rate_limit_exceeded.json
new file mode 100644
index 0000000..e28441c
--- /dev/null
+++ b/src/test/resources/tvtime_rate_limit_exceeded.json
@@ -0,0 +1,5 @@
+{
+  "code": 403,
+  "result": "KO",
+  "message": "API rate limit exceeded."
+}
\ No newline at end of file
diff --git a/src/test/resources/tvtime_request_device_code.json b/src/test/resources/tvtime_request_device_code.json
new file mode 100644
index 0000000..209d2c2
--- /dev/null
+++ b/src/test/resources/tvtime_request_device_code.json
@@ -0,0 +1,8 @@
+{
+  "result": "OK",
+  "device_code": "3PngU8jQ7TKUwE475tBH",
+  "user_code": "be0e-7ab3",
+  "verification_url": "https://fakerequest/activate",
+  "expires_in": 900,
+  "interval": 5
+}
\ No newline at end of file