diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java
index 3b2f027..2ad55ca 100644
--- a/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java
@@ -61,19 +61,6 @@ public class PersistencePostgreSQLTest extends ContextTest {
 		return serviceUsageRecord;
 	}
 	*/
-	
-	protected AggregatedServiceUsageRecord getTestAggregatedServiceUsageRecord() throws Exception {
-		ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord();
-		AggregatedServiceUsageRecord aggregatedServiceUsageRecord = new AggregatedServiceUsageRecord(serviceUsageRecord);
-		return aggregatedServiceUsageRecord;
-	}
-	
-	protected AggregatedStorageUsageRecord getTestAggregatedStorageUsageRecord() throws Exception {
-		StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord();
-		AggregatedStorageUsageRecord aggregatedStorageUsageRecord = new AggregatedStorageUsageRecord(storageUsageRecord);
-		return aggregatedStorageUsageRecord;
-	}
-	
 	protected AggregatedJobUsageRecord getTestAggregatedJobUsageRecord() throws Exception {
 		JobUsageRecord jobUsageRecord = TestUsageRecord.createTestJobUsageRecord();
 		AggregatedJobUsageRecord aggregatedJobUsageRecord = new AggregatedJobUsageRecord(jobUsageRecord);
@@ -86,12 +73,24 @@ public class PersistencePostgreSQLTest extends ContextTest {
 		return aggregatedPortletUsageRecord;
 	}
 	
+	protected AggregatedServiceUsageRecord getTestAggregatedServiceUsageRecord() throws Exception {
+		ServiceUsageRecord serviceUsageRecord = TestUsageRecord.createTestServiceUsageRecord();
+		AggregatedServiceUsageRecord aggregatedServiceUsageRecord = new AggregatedServiceUsageRecord(serviceUsageRecord);
+		return aggregatedServiceUsageRecord;
+	}
+	
 	protected AggregatedStorageStatusRecord getTestAggregatedStorageStatusRecord() throws Exception {
 		StorageStatusRecord storageStatusRecord = TestUsageRecord.createTestStorageVolumeUsageRecord();
 		AggregatedStorageStatusRecord aggregatedStorageStatusRecord = new AggregatedStorageStatusRecord(storageStatusRecord);
 		return aggregatedStorageStatusRecord;
 	}
 	
+	protected AggregatedStorageUsageRecord getTestAggregatedStorageUsageRecord() throws Exception {
+		StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord();
+		AggregatedStorageUsageRecord aggregatedStorageUsageRecord = new AggregatedStorageUsageRecord(storageUsageRecord);
+		return aggregatedStorageUsageRecord;
+	}
+		
 	@Test
 	public void testSQLStatementString() throws Exception {
 		PersistencePostgreSQL persistencePostgreSQL = new PersistencePostgreSQL();
diff --git a/src/test/resources/PortletUsageRecordTable.sql b/src/test/resources/PortletUsageRecordTable.sql
new file mode 100644
index 0000000..9041fe3
--- /dev/null
+++ b/src/test/resources/PortletUsageRecordTable.sql
@@ -0,0 +1,14 @@
+CREATE TABLE "portletusagerecord"(
+	id TEXT NOT NULL,
+	consumer_id TEXT NOT NULL,
+	creation_time TIMESTAMP WITH TIME ZONE NOT NULL,
+	scope TEXT NOT NULL,
+	operation_result operation_result NOT NULL,
+	caller_qualifier TEXT NOT NULL DEFAULT 'TOKEN',
+	portlet_id TEXT NOT NULL,
+	operation_id TEXT NOT NULL,
+	operation_count INTEGER NOT NULL DEFAULT 1,
+	aggregated BOOLEAN NOT NULL DEFAULT true,
+	start_time TIMESTAMP WITH TIME ZONE NOT NULL,
+	end_time TIMESTAMP WITH TIME ZONE NOT NULL
+);
\ No newline at end of file