diff --git a/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
index 1b91742ea..053f2022d 100644
--- a/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
+++ b/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
@@ -37,6 +37,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase {
     ServerCacheManager serverCacheManager = Ebean.getDefaultServer().getServerCacheManager();
     ServerCache beanCache = serverCacheManager.getBeanCache(UUOne.class);
     beanCache.clear();
+    beanCache.getStatistics(true); // Reset statistics - otherwise other tests will interfere
 
     UUOne b = Ebean.find(UUOne.class, inserted.get(1).getId());
     assertNotNull(b);
diff --git a/src/test/java/org/tests/inherit/Data.java b/src/test/java/org/tests/inherit/Data.java
index 19beedcc4..616beefec 100644
--- a/src/test/java/org/tests/inherit/Data.java
+++ b/src/test/java/org/tests/inherit/Data.java
@@ -1,5 +1,6 @@
 package org.tests.inherit;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
@@ -16,7 +17,7 @@ public class Data {
 
   private Integer val;
 
-  @ManyToMany(mappedBy = "data")
+  @ManyToMany(mappedBy = "data", cascade = CascadeType.ALL)
   public List<Parent> parents = new ArrayList<>();
 
   public Data(int number) {
diff --git a/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
index 83ff17ad0..06edab471 100644
--- a/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
+++ b/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
@@ -4,6 +4,8 @@ import io.ebean.BaseTestCase;
 import io.ebean.DuplicateKeyException;
 import io.ebean.Ebean;
 import io.ebean.annotation.Transactional;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +20,11 @@ public class TestInsertDuplicateKey extends BaseTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(TestInsertDuplicateKey.class);
 
+  @Before
+  public void clearDb() {
+    server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete();
+  }
+  
   @Test(expected = DuplicateKeyException.class)
   public void insert_duplicateKey() {
 
diff --git a/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java
index 7735318db..e7aa57300 100644
--- a/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java
+++ b/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java
@@ -6,6 +6,7 @@ import org.tests.inherit.ChildA;
 import org.tests.inherit.ChildB;
 import org.tests.inherit.Data;
 import org.tests.inherit.Parent;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -16,6 +17,14 @@ import static org.junit.Assert.assertNotNull;
 
 public class ParentQueryTest extends BaseTestCase {
 
+  @Before
+  public void clearDb() {
+    Ebean.deleteAll(Ebean.find(Data.class).findList());
+    //@rob: this does not work as it does not clear the ManyToMany relations.
+    //Ebean.find(Data.class).delete(); 
+    Ebean.find(Parent.class).delete();
+  }
+  
   @Test
   public void QueryParentCollectionFetch() {
 
diff --git a/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java
index e9079e8f4..6adca199f 100644
--- a/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java
+++ b/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java
@@ -11,6 +11,7 @@ import org.tests.inherit.Data;
 import org.tests.inherit.EUncle;
 import org.tests.inherit.Parent;
 import org.tests.inherit.ParentAggregate;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -20,6 +21,14 @@ import static org.junit.Assert.*;
 
 public class ParentRawSqlTest extends BaseTestCase {
 
+  @Before
+  public void clearDb() {
+    Ebean.deleteAll(Ebean.find(Data.class).findList());
+    //@rob: this does not work as it does not clear the ManyToMany relations.
+    //Ebean.find(Data.class).delete(); 
+    Ebean.find(Parent.class).delete();
+  }
+  
   @Test
   public void RawSqlParentLoad() {
 
diff --git a/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java
index cecc08a46..ee41b162e 100644
--- a/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java
+++ b/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java
@@ -6,6 +6,7 @@ import io.ebean.text.json.JsonContext;
 import io.ebean.text.json.JsonWriteOptions;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -13,6 +14,11 @@ import java.util.List;
 
 public class TestTextJsonInvokeLazy extends BaseTestCase {
 
+  @Before
+  public void clearBeanCache() {
+    server().getPluginApi().getBeanType(Customer.class).clearBeanCache();
+  }
+  
   @Test
   public void test() throws IOException {