diff --git a/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java b/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java
index ffe6d2b..c9d85ad 100644
--- a/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java
+++ b/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java
@@ -7,14 +7,14 @@ package org.gcube.dataharvest.datamodel;
 /**
  *
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * May 22, 2018
+ * @author M. Assante, ISTI-CNR
  */
 public enum HarvestedDataKey {
 
-	CATALOGUE_ACCESSES("Catalogue Home Accesses"),
-	CATALOGUE_DATASET_LIST_ACCESSES("Catalogue Datasets List (Also Filtered)"),
-	CATALOGUE_DATASET_ACCESSES("Catalogue Dataset"),
-	CATALOGUE_RESOURCE_ACCESSES("Catalogue Resource"),
+	CATALOGUE_ACCESSES("Catalogue Accesses"),
+	CATALOGUE_DATASET_LIST_ACCESSES("Item List"),
+	CATALOGUE_DATASET_ACCESSES("Item Metadata"),
+	CATALOGUE_RESOURCE_ACCESSES("Item Resource"),
 	ACCESSES("VRE Accesses"),
 	USERS("VRE Users"),
 	DATA_METHOD_DOWNLOAD("Data/Method download"),
diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
index 4959dbf..8d8b36d 100644
--- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
+++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
@@ -733,12 +733,22 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
 	@Test
 	public void testCatalogueHarvester() {
 		try {
+<<<<<<< HEAD
 
 			String context = ROOT; //"/gcube";
 			ContextTest.setContextByName(context);
 			
 			AccountingDao dao = getAccountingDao();
 			
+=======
+//			String context = ROOT;
+			String context = "/gcube";
+			//Utils.setContext(RESOURCE_CATALOGUE);
+			ContextTest.setContextByName(context);
+			System.out.println("vaaa");
+			AggregationType measureType = AggregationType.MONTHLY;
+
+>>>>>>> refs/remotes/origin/feature/18848
 			Date start = DateUtils.getStartCalendar(2020, Calendar.JANUARY, 1).getTime();
 			Date end = DateUtils.getStartCalendar(2020, Calendar.FEBRUARY, 1).getTime();
 
@@ -757,7 +767,28 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
 			}
 			logger.debug("{}", accountingRecords);
 
+<<<<<<< HEAD
 			dao.insertRecords(accountingRecords.toArray(new AccountingRecord[1]));
+=======
+//			ContextAuthorization contextAuthorization = new ContextAuthorization();
+//			SortedSet<String> contexts = contextAuthorization.getContexts();
+
+
+//			for(String context : contexts) {
+				ScopeBean scopeBean = new ScopeBean(context);
+				logger.debug("FullName {} - Name {}", scopeBean.toString(), scopeBean.name());
+
+
+				ContextTest.setContextByName(context);
+				CatalogueAccessesHarvester catalogueHarvester = new CatalogueAccessesHarvester(start, end); 
+				List<AccountingRecord> data = catalogueHarvester.getAccountingRecords();
+				for (AccountingRecord accountingRecord : data) {
+					logger.debug("{}", accountingRecord);
+				}
+				logger.debug("{}", data);
+
+//			}
+>>>>>>> refs/remotes/origin/feature/18848
 
 		} catch(Exception e) {
 			logger.error("", e);