diff --git a/src/test/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPluginTest.java b/src/test/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPluginTest.java
index 1c90e27..d8a98c1 100644
--- a/src/test/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPluginTest.java
+++ b/src/test/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPluginTest.java
@@ -193,63 +193,7 @@ public class AccountingAggregatorPluginTest extends ContextTest {
 		
 	}
 	
-	
-	@Test
-	public void aggregateYearlyServiceProd() throws Exception {
-		//ContextTest.setContextByName(ROOT_DEV_SCOPE);
-		ContextTest.setContextByName(ROOT_PROD);
-		
-		Map<String, Object> inputs = new HashMap<String, Object>(); 	
-		
-		
-		AggregationType aggregationType = AggregationType.YEARLY;
-		//type aggregation
-		inputs.put(AccountingAggregatorPlugin.AGGREGATION_TYPE_INPUT_PARAMETER, aggregationType.name());
-		
-		inputs.put(AccountingAggregatorPlugin.ELABORATION_TYPE_INPUT_PARAMETER, ElaborationType.AGGREGATE.name());
-		
-		
-		inputs.put(AccountingAggregatorPlugin.PERSIST_START_TIME_INPUT_PARAMETER, Utility.getPersistTimeParameter(0, 10));
-		inputs.put(AccountingAggregatorPlugin.PERSIST_END_TIME_INPUT_PARAMETER, Utility.getPersistTimeParameter(23, 59));
-		
-		
-		inputs.put(AccountingAggregatorPlugin.RECORD_TYPE_INPUT_PARAMETER, ServiceUsageRecord.class.newInstance().getRecordType());
-			
-		inputs.put(AccountingAggregatorPlugin.RESTART_FROM_LAST_AGGREGATION_DATE_INPUT_PARAMETER, false);
-		
-		inputs.put(AccountingAggregatorPlugin.FORCE_EARLY_AGGREGATION, true);
-		inputs.put(AccountingAggregatorPlugin.FORCE_RERUN, true);
-		inputs.put(AccountingAggregatorPlugin.FORCE_RESTART, true);
-		
-		Calendar aggregationStartCalendar = Utility.getAggregationStartCalendar(2015, Calendar.JANUARY, 1);
-		String aggregationStartDate = AccountingAggregatorPlugin.AGGREGATION_START_DATE_DATE_FORMAT.format(aggregationStartCalendar.getTime());
-		logger.trace("{} : {}", AccountingAggregatorPlugin.AGGREGATION_START_DATE_INPUT_PARAMETER, aggregationStartDate);
-		inputs.put(AccountingAggregatorPlugin.AGGREGATION_START_DATE_INPUT_PARAMETER, aggregationStartDate);
-		
-		Calendar aggregationEndCalendar = Utility.getEndCalendarFromStartCalendar(aggregationType, aggregationStartCalendar, 3);
-		// Calendar aggregationEndCalendar = Utility.getAggregationStartCalendar(2021, Calendar.JULY, 1);
-		/*
-		String aggregationEndDate = AccountingAggregatorPlugin.AGGREGATION_START_DATE_DATE_FORMAT.format(aggregationEndCalendar.getTime());
-		logger.trace("{} : {}", AccountingAggregatorPlugin.AGGREGATION_START_DATE_INPUT_PARAMETER, aggregationEndDate);
-		inputs.put(AccountingAggregatorPlugin.AGGREGATION_END_DATE_INPUT_PARAMETER, aggregationEndDate);
-		*/
-		
-		AccountingAggregatorPlugin plugin = new AccountingAggregatorPlugin();
-		logger.debug("Going to launch {} with inputs {}", plugin.getName(), inputs);
-		
-		
-		
-		while(aggregationStartCalendar.before(aggregationEndCalendar)) {
-			plugin.launch(inputs);
-			//Thread.sleep(TimeUnit.MINUTES.toMillis(1));
-			aggregationStartCalendar.add(aggregationType.getCalendarField(), 1);
-			aggregationStartDate = AccountingAggregatorPlugin.AGGREGATION_START_DATE_DATE_FORMAT.format(aggregationStartCalendar.getTime());
-			inputs.put(AccountingAggregatorPlugin.AGGREGATION_START_DATE_INPUT_PARAMETER, aggregationStartDate);
-		}
-		
-	}
-	
-	// @JsonIgnore
+	@JsonIgnore
 	@Test
 	public void aggregateService() throws Exception {
 		ContextTest.setContextByName(ROOT_DEV_SCOPE);
@@ -305,16 +249,6 @@ public class AccountingAggregatorPluginTest extends ContextTest {
 		
 	}
 	
-	/*
-	@Test
-	public void cycle() throws Exception {
-		for(int i=0; i<20; i++) {
-			aggregate();
-			logger.debug("---------------------------------------------\n\n");
-		}
-	}
-	*/
-	
 	@JsonIgnore
 	@Test
 	public void testRecovery() throws Exception {
@@ -334,10 +268,8 @@ public class AccountingAggregatorPluginTest extends ContextTest {
 		logger.trace("{} : {}", AccountingAggregatorPlugin.AGGREGATION_START_DATE_INPUT_PARAMETER, aggregationStartDate);
 		inputs.put(AccountingAggregatorPlugin.AGGREGATION_START_DATE_INPUT_PARAMETER, aggregationStartDate);
 		
-		inputs.put(AccountingAggregatorPlugin.FORCE_EARLY_AGGREGATION, true);
 		inputs.put(AccountingAggregatorPlugin.FORCE_RESTART, true);
 		
-		
 		// Calendar aggregationEndCalendar = Utility.getEndCalendarFromStartCalendar(AggregationType.MONTHLY, aggregationStartCalendar, 1);
 		Calendar aggregationEndCalendar = Utility.getAggregationStartCalendar(2017, Calendar.JUNE, 1);
 		String aggregationEndDate = AccountingAggregatorPlugin.AGGREGATION_START_DATE_DATE_FORMAT.format(aggregationEndCalendar.getTime());