diff --git a/src/test/java/org/gcube/documentstore/persistence/AggregationSchedulerTest.java b/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java
similarity index 95%
rename from src/test/java/org/gcube/documentstore/persistence/AggregationSchedulerTest.java
rename to src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java
index 8f2f9a6..ad9cce8 100644
--- a/src/test/java/org/gcube/documentstore/persistence/AggregationSchedulerTest.java
+++ b/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java
@@ -1,22 +1,21 @@
 /**
  * 
  */
-package org.gcube.documentstore.persistence;
+package org.gcube.documentstore.records.aggregation;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import org.gcube.accounting.datamodel.UsageRecord;
 import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
+import org.gcube.documentstore.persistence.PersistenceExecutor;
 import org.gcube.documentstore.records.AggregatedRecord;
 import org.gcube.documentstore.records.Record;
 import org.gcube.utils.ScopedTest;
 import org.gcube.utils.StressTestUtility;
 import org.gcube.utils.TestOperation;
 import org.gcube.utils.TestUsageRecord;
-import org.gcube.utils.TestUtility;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -31,8 +30,7 @@ public class AggregationSchedulerTest extends ScopedTest {
 	private static final Logger logger = LoggerFactory.getLogger(AggregationSchedulerTest.class);
 	
 	public static AggregationScheduler getAggregationScheduler(){
-		File fallbackFile = PersistenceBackendFactory.getFallbackFile(TestUtility.getScope());
-		return new BufferAggregationScheduler(new FallbackPersistenceBackend(fallbackFile));
+		return new BufferAggregationScheduler(persistenceExecutor);
 	}
 	
 	public static PersistenceExecutor persistenceExecutor = new PersistenceExecutor(){