diff --git a/src/main/java/io/ebean/AcquireLockException.java b/src/main/java/io/ebean/AcquireLockException.java
index 7bc7aa1b3..bc6e638ff 100644
--- a/src/main/java/io/ebean/AcquireLockException.java
+++ b/src/main/java/io/ebean/AcquireLockException.java
@@ -10,6 +10,7 @@ import javax.persistence.PessimisticLockException;
  * </p>
  */
 public class AcquireLockException extends PessimisticLockException {
+  private static final long serialVersionUID = -8585962352965876691L;
 
   /**
    * Create with a message and cause.
diff --git a/src/main/java/io/ebean/DataIntegrityException.java b/src/main/java/io/ebean/DataIntegrityException.java
index 719b08d71..0d622313c 100644
--- a/src/main/java/io/ebean/DataIntegrityException.java
+++ b/src/main/java/io/ebean/DataIntegrityException.java
@@ -6,6 +6,7 @@ import javax.persistence.PersistenceException;
  * Thrown when a foreign key constraint is enforced.
  */
 public class DataIntegrityException extends PersistenceException {
+  private static final long serialVersionUID = -6740171949170180970L;
 
   /**
    * Create with a message and cause.
diff --git a/src/main/java/io/ebean/DuplicateKeyException.java b/src/main/java/io/ebean/DuplicateKeyException.java
index 18a896370..681b4dd27 100644
--- a/src/main/java/io/ebean/DuplicateKeyException.java
+++ b/src/main/java/io/ebean/DuplicateKeyException.java
@@ -4,6 +4,7 @@ package io.ebean;
  * Thrown when a duplicate is attempted on a unique constraint.
  */
 public class DuplicateKeyException extends DataIntegrityException {
+  private static final long serialVersionUID = -4771932723285724817L;
 
   /**
    * Create with a message and cause.
diff --git a/src/main/java/io/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java
index 2a6169c65..53325d733 100644
--- a/src/main/java/io/ebean/Transaction.java
+++ b/src/main/java/io/ebean/Transaction.java
@@ -129,6 +129,7 @@ public interface Transaction extends AutoCloseable {
   /**
    * Synonym for end() to support AutoClosable.
    */
+  @Override
   void close();
 
   /**
diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java
index 6250c883a..63fe3228b 100644
--- a/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -161,6 +161,7 @@ public interface SpiQuery<T> extends Query<T> {
   /**
    * Return the ForUpdate mode.
    */
+  @Override
   ForUpdate getForUpdateMode();
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index fee90514e..87fcec300 100644
--- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -985,6 +985,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
           docStoreUpdates.queueIndex(beanDescriptor.getDocStoreQueueId(), idValue);
         }
       }
+      break;
       default:
         break;
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ManyType.java b/src/main/java/io/ebeaninternal/server/deploy/ManyType.java
index 7f8b0bfb8..afc3cf045 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ManyType.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ManyType.java
@@ -16,8 +16,10 @@ public enum ManyType {
 
   private final boolean map;
 
+  @SuppressWarnings("rawtypes")
   private final Class<? extends Collection> type;
 
+  @SuppressWarnings("rawtypes")
   ManyType(boolean map, Class<? extends Collection> type) {
     this.map = map;
     this.type = type;
@@ -31,6 +33,7 @@ public enum ManyType {
    * Returns List.class or Set.class and null for Map.
    * Not intended to be called for maps.
    */
+  @SuppressWarnings("rawtypes")
   public Class<? extends Collection> getCollectionType() {
     return type;
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedSqlException.java b/src/main/java/io/ebeaninternal/server/persist/BatchedSqlException.java
index bd8a6726c..605e47c75 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedSqlException.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedSqlException.java
@@ -7,7 +7,8 @@ import java.sql.SQLException;
  * Holds the first SQLException found when executing a JDBC batch.
  */
 public class BatchedSqlException extends Exception {
-
+  private static final long serialVersionUID = -4374631080253580648L;
+  
   private SQLException cause;
 
   BatchedSqlException(String message, SQLException cause) {
diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
index 3e9ed8da8..1b1456a79 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
@@ -18,7 +18,7 @@ public class DJsonScalar {
     this.typeManager = typeManager;
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void write(JsonGenerator gen, Object value) throws IOException {
 
     if (value instanceof String) {
diff --git a/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java b/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
index 60bcae529..a495ed3ba 100644
--- a/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
+++ b/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
@@ -198,7 +198,7 @@ public class ReadJson {
    * If there is a JsonReadBeanVisitor registered to the current path then
    * call it's visit method with the bean and unmappedProperties.
    */
-  @SuppressWarnings(value = "unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void beanVisitor(Object bean, Map<String, Object> unmappedProperties) {
     if (visitorMap != null) {
       JsonReadBeanVisitor visitor = visitorMap.get(pathStack.peekWithNull());
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index ae3404b82..374ecd2a4 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -646,6 +646,7 @@ public class JdbcTransaction implements SpiTransaction {
     }
   }
 
+  @Override
   public PersistenceException translate(String message, SQLException cause) {
     if (manager != null) {
       return manager.translate(message, cause);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index e7429a77e..ceb0de3b7 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -19,6 +19,7 @@ import java.util.UUID;
 /**
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
+@SuppressWarnings("rawtypes")
 public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implements ScalarTypeArray {
 
   private static ScalarTypeArrayList UUID = new ScalarTypeArrayList("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID);
@@ -75,6 +76,7 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection<List> implemen
   /**
    * Return the DB column definition for DDL generation.
    */
+  @Override
   public String getDbColumnDefn() {
     return arrayType + "[]";
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
index 11f1ab175..f41dd0418 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
@@ -48,11 +48,13 @@ class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
     }
   }
 
+  @SuppressWarnings("rawtypes")
   private ScalarTypeArrayListH2(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) {
     super(arrayType, docPropertyType, converter);
   }
 
   @Override
+  @SuppressWarnings("rawtypes")
   public void bind(DataBind bind, List value) throws SQLException {
     if (value == null) {
       bind.setNull(Types.ARRAY);
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index e2e47aedf..c78951bda 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -75,6 +75,7 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection<Set> implements
   /**
    * Return the DB column definition for DDL generation.
    */
+  @Override
   public String getDbColumnDefn() {
     return arrayType + "[]";
   }
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index d57a64c3f..c628af5f8 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -61,6 +61,7 @@ public class ScalarTypeJsonList {
   /**
    * Base class for List handling.
    */
+  @SuppressWarnings("rawtypes")
   private abstract static class Base extends ScalarTypeJsonCollection<List> {
 
     public Base(int dbType, DocPropertyType docType) {
@@ -135,6 +136,7 @@ public class ScalarTypeJsonList {
       this.pgType = pgType;
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public void bind(DataBind bind, List value) throws SQLException {
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index ff714f2ad..9e6f4cc84 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -21,6 +21,7 @@ import java.util.Map;
 /**
  * Type which maps Map<String,Object> to various DB types (Clob, Varchar, Blob) in JSON format.
  */
+@SuppressWarnings("rawtypes")
 public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
 
   private static final ScalarTypeJsonMap CLOB = new ScalarTypeJsonMap.Clob();
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
index 4abe8de4a..b0e1fcaec 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
@@ -17,6 +17,7 @@ public abstract class ScalarTypeJsonMapPostgres extends ScalarTypeJsonMap {
     this.postgresType = postgresType;
   }
 
+  @SuppressWarnings("rawtypes")
   @Override
   public void bind(DataBind bind, Map value) throws SQLException {
 
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 22ebc9fd8..52b432c01 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -67,6 +67,7 @@ public class ScalarTypeJsonObjectMapper {
   /**
    * Type for Sets wrapping the ObjectMapper Set as a ModifyAwareSet.
    */
+  @SuppressWarnings("rawtypes")
   private static class OmSet extends Base<Set> {
 
     public OmSet(ObjectMapper objectMapper, Type type, int dbType, String pgType, DocPropertyType docType) {
@@ -84,6 +85,7 @@ public class ScalarTypeJsonObjectMapper {
   /**
    * Type for Lists wrapping the ObjectMapper List as a ModifyAwareList.
    */
+  @SuppressWarnings("rawtypes")
   private static class OmList extends Base<List> {
 
     public OmList(ObjectMapper objectMapper, Type type, int dbType, String pgType, DocPropertyType docType) {
@@ -101,6 +103,7 @@ public class ScalarTypeJsonObjectMapper {
   /**
    * Type for Map wrapping the ObjectMapper Map as a ModifyAwareMap.
    */
+  @SuppressWarnings("rawtypes")
   private static class OmMap extends Base<Map> {
 
     public OmMap(ObjectMapper objectMapper, Type type, int dbType, String pgType) {
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 66b688a41..f2605331f 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -64,6 +64,7 @@ public class ScalarTypeJsonSet {
   /**
    * Base class for List handling.
    */
+  @SuppressWarnings("rawtypes")
   private abstract static class Base extends ScalarTypeJsonCollection<Set> {
 
     public Base(int dbType, DocPropertyType docPropertyType) {
@@ -142,6 +143,7 @@ public class ScalarTypeJsonSet {
       this.pgType = pgType;
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public void bind(DataBind bind, Set value) throws SQLException {
 
diff --git a/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java
index 9e9990727..1a5ef7fe1 100644
--- a/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java
+++ b/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.text.json;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import io.ebean.config.ServerConfig;
-import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.type.DefaultTypeManager;
diff --git a/src/test/java/org/tests/model/basic/Article.java b/src/test/java/org/tests/model/basic/Article.java
index dd6e9e14c..859eaac0e 100644
--- a/src/test/java/org/tests/model/basic/Article.java
+++ b/src/test/java/org/tests/model/basic/Article.java
@@ -14,6 +14,7 @@ import java.util.List;
 @CacheBeanTuning(maxSecsToLive = 45)
 @Entity
 public class Article extends BasicDomain {
+  private static final long serialVersionUID = -7181090513848918784L;
 
   String name;
 
diff --git a/src/test/java/org/tests/model/basic/Car.java b/src/test/java/org/tests/model/basic/Car.java
index 192e5ad93..9bf17245e 100644
--- a/src/test/java/org/tests/model/basic/Car.java
+++ b/src/test/java/org/tests/model/basic/Car.java
@@ -16,6 +16,7 @@ import java.util.Set;
 @Inheritance
 @DiscriminatorValue("C")
 public class Car extends Vehicle {
+  private static final long serialVersionUID = -65427345082456523L;
 
   public enum Size {
     SMALL("S"),
diff --git a/src/test/java/org/tests/model/basic/OEngine.java b/src/test/java/org/tests/model/basic/OEngine.java
index 2ef2d7bf8..fc3a4cc8f 100644
--- a/src/test/java/org/tests/model/basic/OEngine.java
+++ b/src/test/java/org/tests/model/basic/OEngine.java
@@ -4,10 +4,12 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Version;
+
+import java.io.Serializable;
 import java.util.UUID;
 
 @Entity
-public class OEngine {
+public class OEngine implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
diff --git a/src/test/java/org/tests/model/basic/OGearBox.java b/src/test/java/org/tests/model/basic/OGearBox.java
index d6a2987d3..955807fab 100644
--- a/src/test/java/org/tests/model/basic/OGearBox.java
+++ b/src/test/java/org/tests/model/basic/OGearBox.java
@@ -5,10 +5,12 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Version;
+
+import java.io.Serializable;
 import java.util.UUID;
 
 @Entity
-public class OGearBox {
+public class OGearBox implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
diff --git a/src/test/java/org/tests/model/basic/TIntRoot.java b/src/test/java/org/tests/model/basic/TIntRoot.java
index 188a8e3f4..db7d3d89c 100644
--- a/src/test/java/org/tests/model/basic/TIntRoot.java
+++ b/src/test/java/org/tests/model/basic/TIntRoot.java
@@ -1,5 +1,7 @@
 package org.tests.model.basic;
 
+import java.io.Serializable;
+
 import javax.persistence.DiscriminatorColumn;
 import javax.persistence.DiscriminatorType;
 import javax.persistence.DiscriminatorValue;
@@ -11,7 +13,8 @@ import javax.persistence.Inheritance;
 @Inheritance
 @DiscriminatorColumn(name = "my_type", length = 3, discriminatorType = DiscriminatorType.INTEGER)
 @DiscriminatorValue("1")
-public class TIntRoot {
+public class TIntRoot implements Serializable {
+  private static final long serialVersionUID = -7057502590435806504L;
 
   @Id
   Integer id;
diff --git a/src/test/java/org/tests/model/basic/TMappedSuper2.java b/src/test/java/org/tests/model/basic/TMappedSuper2.java
index 3a9150485..aa3943278 100644
--- a/src/test/java/org/tests/model/basic/TMappedSuper2.java
+++ b/src/test/java/org/tests/model/basic/TMappedSuper2.java
@@ -1,11 +1,14 @@
 package org.tests.model.basic;
 
+import java.io.Serializable;
+
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
 @MappedSuperclass
-public class TMappedSuper2 {
+public class TMappedSuper2 implements Serializable {
+  private static final long serialVersionUID = 325282672490816821L;
 
   String something;
 
diff --git a/src/test/java/org/tests/model/basic/Truck.java b/src/test/java/org/tests/model/basic/Truck.java
index 4a063005b..b8d03b091 100644
--- a/src/test/java/org/tests/model/basic/Truck.java
+++ b/src/test/java/org/tests/model/basic/Truck.java
@@ -12,6 +12,7 @@ import javax.persistence.ManyToOne;
 @Inheritance
 @DiscriminatorValue("T")
 public class Truck extends Vehicle {
+  private static final long serialVersionUID = 9195535931523211134L;
 
   public enum Size {
     SMALL("S"),
diff --git a/src/test/java/org/tests/model/basic/cache/CInhOne.java b/src/test/java/org/tests/model/basic/cache/CInhOne.java
index 7a73710ed..1bb0a459b 100644
--- a/src/test/java/org/tests/model/basic/cache/CInhOne.java
+++ b/src/test/java/org/tests/model/basic/cache/CInhOne.java
@@ -11,6 +11,7 @@ import javax.persistence.Inheritance;
 @Inheritance
 @DiscriminatorValue("O")
 public class CInhOne extends CInhRoot {
+  private static final long serialVersionUID = -3933815364935720317L;
 
   private String driver;
 
diff --git a/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/src/test/java/org/tests/model/basic/cache/CInhRoot.java
index 77e2a16ca..94b631159 100644
--- a/src/test/java/org/tests/model/basic/cache/CInhRoot.java
+++ b/src/test/java/org/tests/model/basic/cache/CInhRoot.java
@@ -12,6 +12,7 @@ import javax.persistence.Inheritance;
 @Inheritance
 @DiscriminatorColumn(length = 3)
 public abstract class CInhRoot extends BasicDomain {
+  private static final long serialVersionUID = -4673953370819311120L;
 
   private String licenseNumber;
 
diff --git a/src/test/java/org/tests/model/basic/cache/CInhTwo.java b/src/test/java/org/tests/model/basic/cache/CInhTwo.java
index d0e18c9be..53d3685e8 100644
--- a/src/test/java/org/tests/model/basic/cache/CInhTwo.java
+++ b/src/test/java/org/tests/model/basic/cache/CInhTwo.java
@@ -11,6 +11,7 @@ import javax.persistence.Inheritance;
 @Inheritance
 @DiscriminatorValue("T")
 public class CInhTwo extends CInhRoot {
+  private static final long serialVersionUID = -8528396890675473212L;
 
   private String action;
 
diff --git a/src/test/java/org/tests/model/onetoone/OCompany.java b/src/test/java/org/tests/model/onetoone/OCompany.java
index 718f896fa..22cc9fc8b 100644
--- a/src/test/java/org/tests/model/onetoone/OCompany.java
+++ b/src/test/java/org/tests/model/onetoone/OCompany.java
@@ -7,7 +7,8 @@ import javax.persistence.Entity;
 
 @Entity
 public class OCompany extends BasicDomain {
-
+  private static final long serialVersionUID = 6733591692223352686L;
+  
   @Column(length = 50, unique = true)
   public String corpId;
 
diff --git a/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java b/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java
index bc7ab5a9f..7a0b406aa 100644
--- a/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java
+++ b/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java
@@ -9,7 +9,8 @@ import javax.persistence.OneToOne;
 
 @Entity
 public class ORoadShowMsg extends BasicDomain {
-
+  private static final long serialVersionUID = -1555123312818834212L;
+  
   @OneToOne(cascade = CascadeType.ALL, optional = false)
   @JoinColumn()//(name = "corp_id", nullable = false, referencedColumnName = "corp_id")
   public OCompany company;
diff --git a/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/src/test/java/org/tests/model/selfref/BaseResourceFile.java
index 3b55ff90c..fa96461c1 100644
--- a/src/test/java/org/tests/model/selfref/BaseResourceFile.java
+++ b/src/test/java/org/tests/model/selfref/BaseResourceFile.java
@@ -3,10 +3,12 @@ package org.tests.model.selfref;
 import javax.persistence.Column;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
+
+import java.io.Serializable;
 import java.util.UUID;
 
 @MappedSuperclass
-public abstract class BaseResourceFile {
+public abstract class BaseResourceFile implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
diff --git a/src/test/java/org/tests/sp/model/IdEntity.java b/src/test/java/org/tests/sp/model/IdEntity.java
index c1493d21f..c6e8d68ca 100644
--- a/src/test/java/org/tests/sp/model/IdEntity.java
+++ b/src/test/java/org/tests/sp/model/IdEntity.java
@@ -1,5 +1,7 @@
 package org.tests.sp.model;
 
+import java.io.Serializable;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -7,7 +9,8 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.Version;
 
 @MappedSuperclass
-public abstract class IdEntity {
+public abstract class IdEntity implements Serializable {
+  private static final long serialVersionUID = 7804145008732783678L;
 
   @Id
   @GeneratedValue(strategy = GenerationType.SEQUENCE)