diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java
index 45e0499..6f1945a 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java
@@ -11,7 +11,6 @@ import org.gcube.application.cms.plugins.requests.BaseExecutionRequest;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.identification.IdentificationReference;
import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation;
-import org.gcube.application.geoportal.common.model.document.identification.TemporalReference;
import java.util.ArrayList;
import java.util.List;
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java
index 04019f7..b8c680f 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java
@@ -1,19 +1,10 @@
package org.gcube.application.cms.plugins.reports;
-import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
-import org.bson.Document;
import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException;
-import org.gcube.application.cms.plugins.faults.PluginExecutionException;
import org.gcube.application.cms.plugins.requests.IndexDocumentRequest;
-import org.gcube.application.geoportal.common.model.document.Project;
-import org.gcube.application.geoportal.common.model.document.identification.IdentificationReference;
-import org.gcube.application.geoportal.common.model.document.identification.TemporalReference;
-
-import java.util.ArrayList;
-import java.util.List;
@Getter
@Setter
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java
index 6bdbd7b..16b3f74 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java
@@ -1,6 +1,5 @@
package org.gcube.application.cms.plugins.reports;
-import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java
index 3c84bb9..38cd2c5 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java
@@ -1,7 +1,10 @@
package org.gcube.application.cms.plugins.reports;
import com.fasterxml.jackson.core.JsonProcessingException;
-import lombok.*;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.ToString;
import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException;
import org.gcube.application.cms.plugins.faults.PluginExecutionException;
import org.gcube.application.cms.plugins.requests.EventExecutionRequest;
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java
index 493242a..dfcf190 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java
@@ -1,7 +1,9 @@
package org.gcube.application.cms.plugins.requests;
-import lombok.*;
-import org.bson.Document;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.ToString;
import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.accounting.Context;
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java
index 12cb4a4..1e2191d 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java
@@ -1,12 +1,9 @@
package org.gcube.application.cms.plugins.requests;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ser.Serializers;
import lombok.*;
import org.bson.Document;
import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException;
import org.gcube.application.cms.serialization.Serialization;
-import org.gcube.application.geoportal.common.faults.InvalidRequestException;
import org.gcube.application.geoportal.common.model.document.accounting.Context;
import org.gcube.application.geoportal.common.model.document.accounting.User;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java
index 6c930be..25ec153 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java
@@ -1,6 +1,9 @@
package org.gcube.application.cms.plugins.requests;
-import lombok.*;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.ToString;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.accounting.Context;
import org.gcube.application.geoportal.common.model.document.accounting.User;
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java
index 80869ac..6cf8376 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java
@@ -1,6 +1,9 @@
package org.gcube.application.cms.plugins.requests;
-import lombok.*;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.ToString;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.accounting.Context;
import org.gcube.application.geoportal.common.model.document.accounting.User;
diff --git a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java b/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java
index 1bd9c54..fa499a0 100644
--- a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java
+++ b/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java
@@ -1,11 +1,5 @@
package org.gcube.application.cms.plugins;
-import com.sun.org.apache.xpath.internal.axes.BasicTestIterator;
-import org.gcube.application.cms.plugins.implementations.SimpleLifeCycleManager;
-import org.gcube.application.cms.plugins.requests.EventExecutionRequest;
-import org.gcube.application.cms.plugins.requests.StepExecutionRequest;
-import org.gcube.application.geoportal.common.model.document.Project;
-
public class SimpleLifecycleTests{
// NB cannot use test commons, need to separate modules
diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java
new file mode 100644
index 0000000..d0987c4
--- /dev/null
+++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java
@@ -0,0 +1,9 @@
+package org.gcube.application.cms.tests;
+
+import java.io.File;
+
+public class Tests {
+
+ public static File BASE_FOLDER =new File("../test-data");
+ public static File FOLDER_CONCESSIONI =new File("../test-data/concessioni");
+}
diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java
index 83c4742..06ca9fe 100644
--- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java
+++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java
@@ -2,7 +2,6 @@ package org.gcube.application.cms.tests.model;
import com.vdurmont.semver4j.Semver;
import org.bson.Document;
-import org.bson.types.ObjectId;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.document.access.AccessPolicy;
@@ -16,7 +15,6 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.DataAccess
import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
-import javax.jws.soap.SOAPBinding;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.UUID;
diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java
index 4291eda..3fab84a 100644
--- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java
+++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java
@@ -6,12 +6,11 @@ import org.gcube.application.cms.plugins.LifecycleManager;
import org.gcube.application.cms.plugins.MaterializationPlugin;
import org.gcube.application.cms.plugins.PluginManagerInterface;
import org.gcube.application.cms.plugins.faults.*;
-import org.gcube.application.cms.plugins.model.ComparableVersion;
-import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor;
import org.gcube.application.cms.plugins.reports.*;
import org.gcube.application.cms.plugins.requests.*;
import org.gcube.application.geoportal.common.model.configuration.Configuration;
import org.gcube.application.geoportal.common.model.configuration.Index;
+import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor;
import org.gcube.application.geoportal.common.model.rest.ConfigurationException;
public class DummyPlugin implements LifecycleManager, IndexerPluginInterface, MaterializationPlugin {
diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java
deleted file mode 100644
index b998b87..0000000
--- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.gcube.application.cms.tests.model.concessioni;
-
-import org.gcube.application.geoportal.common.utils.Files;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import java.util.HashMap;
-
-public class TestConcessioniFilters {
-
- public static final HashMap