diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java
index e5c664c..4ebbaaa 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java
@@ -7,13 +7,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.gcube.accounting.datamodel.BasicUsageRecord;
 import org.gcube.accounting.datamodel.UsageRecord;
-import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
+import org.gcube.accounting.testutility.TestUsageRecord;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.documentstore.exception.InvalidValueException;
-import org.gcube.documentstore.persistence.FallbackPersistenceBackend;
-import org.gcube.documentstore.persistence.PersistenceBackend;
-import org.gcube.documentstore.persistence.PersistenceBackendFactory;
-import org.gcube.documentstore.persistence.PersistenceBackendMonitor;
 import org.gcube.utils.StressTestUtility;
 import org.gcube.utils.TestOperation;
 import org.gcube.utils.TestUtility;
diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java
index fe9d6a7..9521499 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java
@@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.gcube.accounting.datamodel.BasicUsageRecord;
 import org.gcube.accounting.datamodel.UsageRecord;
-import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
+import org.gcube.accounting.testutility.TestUsageRecord;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.utils.StressTestUtility;
 import org.gcube.utils.TestOperation;
@@ -28,10 +28,6 @@ public class PersistenceBackendTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(PersistenceBackendTest.class);
 	
-	public static final String[] SCOPES = new String[]{"/gcube", "/gcube/devNext"};
-	public static final String GCUBE_SCOPE = SCOPES[0];
-	public static final String GCUBE_DEVNEXT_SCOPE = SCOPES[1];
-	
 	public static final long timeout = 5000;
 	public static final TimeUnit timeUnit = TimeUnit.MILLISECONDS;
 	
diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java
index c180fcf..5faeacb 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java
@@ -5,7 +5,7 @@ package org.gcube.documentstore.persistence;
 
 import java.net.URL;
 
-import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
+import org.gcube.accounting.testutility.TestUsageRecord;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.documentstore.records.Record;
 import org.gcube.utils.TestUtility;
diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java
index f4d2015..f3cab86 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java
@@ -6,7 +6,7 @@ package org.gcube.documentstore.persistence;
 import java.net.URL;
 
 import org.codehaus.jackson.JsonNode;
-import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
+import org.gcube.accounting.testutility.TestUsageRecord;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.documentstore.records.Record;
 import org.gcube.utils.TestUtility;
diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java
index 1a575ac..b1ca079 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java
@@ -8,7 +8,6 @@ import java.net.URL;
 import org.bson.Document;
 import org.gcube.accounting.datamodel.UsageRecord;
 import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.OperationType;
-import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.documentstore.records.Record;
 import org.gcube.utils.TestUtility;
@@ -70,7 +69,7 @@ public class PersistenceMongoDBTest {
 		PersistenceBackendConfiguration persitenceConfiguration = PersistenceBackendConfiguration.getUnconfiguredInstance();
 		persitenceConfiguration.addProperty(PersistenceMongoDB.URL_PROPERTY_KEY, url.toString());
 		persitenceConfiguration.addProperty(PersistenceMongoDB.USERNAME_PROPERTY_KEY, "accounting");
-		persitenceConfiguration.addProperty(PersistenceMongoDB.PASSWORD_PROPERTY_KEY, "testpwd");
+		persitenceConfiguration.addProperty(PersistenceMongoDB.PASSWORD_PROPERTY_KEY, "");
 		persitenceConfiguration.addProperty(PersistenceMongoDB.DB_NAME,"accounting");
 		persitenceConfiguration.addProperty(PersistenceMongoDB.COLLECTION_NAME, UsageRecord.class.getSimpleName());
 		PersistenceMongoDB mongo = new PersistenceMongoDB();