diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
index 127add677..70db092d0 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
@@ -23,9 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TokenAuthorisation extends AbstractJsonMapping {
 
-    /*
-     * Properties
-     */
+    private static final long serialVersionUID = 2L;
     @JsonProperty("expires_at")
     private String expires;
     @JsonProperty("request_token")
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
index 6fc741472..f812e623a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
@@ -23,9 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TokenSession extends AbstractJsonMapping {
 
-    /*
-     * Properties
-     */
+    private static final long serialVersionUID = 2L;
     @JsonProperty("session_id")
     private String sessionId;
     @JsonProperty("success")
diff --git a/src/test/java/com/omertron/themoviedbapi/AbstractTests.java b/src/test/java/com/omertron/themoviedbapi/AbstractTests.java
index db4a1cd87..fce9a3d85 100644
--- a/src/test/java/com/omertron/themoviedbapi/AbstractTests.java
+++ b/src/test/java/com/omertron/themoviedbapi/AbstractTests.java
@@ -135,7 +135,7 @@ public class AbstractTests {
         LOG.info("Reading object from '{}'", filename);
         try {
             byte[] serObject = FileUtils.readFileToByteArray(serFile);
-            return SerializationUtils.deserialize(serObject);
+            return (T) SerializationUtils.deserialize(serObject);
         } catch (IOException ex) {
             LOG.info("Failed to read {}: {}", filename, ex.getMessage(), ex);
             return null;
@@ -168,7 +168,7 @@ public class AbstractTests {
                 assertTrue("Session token is not valid", tokenSession.getSuccess());
 
                 // Write the object to a file
-                writeObject(token, filename);
+                writeObject(tokenSession, filename);
             }
         }
         return tokenSession.getSessionId();