diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java
index 27d464f..d54c939 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java
@@ -3,9 +3,11 @@
  */
 package org.gcube.documentstore.persistence;
 
-import org.gcube.accounting.datamodel.UsageRecord;
+import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +19,7 @@ public class PersistencePostgreSQLTest extends ContextTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(PersistencePostgreSQLTest.class);
 		
+	@Ignore
 	@Test
 	public void persistenceIsPostgreSQL() throws ObjectNotFound, Exception {
 		logger.debug("Going to check if the Persistence is CouchBase");
@@ -28,6 +31,7 @@ public class PersistencePostgreSQLTest extends ContextTest {
 		Assert.assertTrue(persistenceBackend instanceof PersistencePostgreSQL);
 	}
 	
+	@Ignore
 	@Test
 	public void testInsertRecords() throws ObjectNotFound, Exception {
 		PersistenceBackendFactory.setFallbackLocation(null);
@@ -36,22 +40,14 @@ public class PersistencePostgreSQLTest extends ContextTest {
 		PersistenceBackend persistenceBackend = PersistenceBackendFactory.rediscoverPersistenceBackend(fallbackPersistenceBackend, context);
 		Assert.assertTrue(persistenceBackend instanceof PersistencePostgreSQL);
 		PersistencePostgreSQL persistencePostgreSQL = (PersistencePostgreSQL) persistenceBackend;
-		for(int i=0; i<1000000; i++) {
+		for(int i=0; i<1; i++) {
 			if(i%50000 == 0) {
 				persistencePostgreSQL.commitAndClose();
 			}
 			
-			/*
-			AggregatedServiceUsageRecord usageRecord = getTestServiceUsageRecord();
-			/*
-			logger.debug("operationCount : {} - min : {} duration : {} - max : {}", 
-					usageRecord.getOperationCount(), 
-					usageRecord.getMinInvocationTime(),
-					usageRecord.getDuration(),
-					usageRecord.getMaxInvocationTime());
-			* /
-			persistencePostgreSQL.insert(usageRecord);
-			*/
+			ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord();
+			AggregatedServiceUsageRecord aggregatedServiceUsageRecord = new AggregatedServiceUsageRecord(serviceUsageRecord);
+			persistencePostgreSQL.insert(aggregatedServiceUsageRecord);
 			
 			/*
 			UsageRecord usageRecord = getTestAggregatedJobUsageRecord();
@@ -67,8 +63,6 @@ public class PersistencePostgreSQLTest extends ContextTest {
 			persistencePostgreSQL.insert(usageRecord);
 			*/
 			
-			UsageRecord usageRecord = TestUsageRecord.getTestAggregatedStorageUsageRecord();
-			persistencePostgreSQL.insert(usageRecord);
 		}
 		persistencePostgreSQL.commitAndClose();
 	}