diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
index 4a5010d..28de1fc 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
@@ -29,8 +29,11 @@ import java.util.List;
 @Slf4j
 public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements LifecycleManager {
 
+    public static final String PLUGIN_ID="DEFAULT-SINGLE-STEP";
+
+
     public SimpleLifeCycleManager() {
-        DESCRIPTOR.setId("DEFAULT-SINGLE-STEP");
+        DESCRIPTOR.setId(PLUGIN_ID);
     }
 
 
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java
index 21c62a8..97b14d0 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java
@@ -11,7 +11,7 @@ public class EventExecutionReport extends DocumentHandlingReport<EventExecutionR
     public EventExecutionReport(EventExecutionRequest req) throws InvalidPluginRequestException {
         super(req);
         this.setToSetLifecycleInformation(theRequest.getDocument().getLifecycleInformation().cleanState());
-
+        this.getToSetLifecycleInformation().setLastOperationStatus(LifecycleInformation.Status.OK);
     }
 
 
diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java
index e0da858..057f2a4 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java
@@ -377,7 +377,7 @@ public class ProfiledMongoManager extends MongoManager implements MongoManagerI<
                     WorkspaceManager ws = new WorkspaceManager();
                     // Get All registered Filesets with payloads
                     JSONPathWrapper wrapper = new JSONPathWrapper(useCaseDescriptor.getSchema().toJson());
-                    for (Object obj : wrapper.getByPath("..*[?(@." + RegisteredFileSet.PAYLOADS + ")]")) {
+                    for (Object obj : wrapper.getByPath("$..[?(@." + RegisteredFileSet.PAYLOADS + ")]")) {
                         Document fs = Serialization.asDocument(obj);
                         log.debug("Deleting {}",obj);
                         String folderId = fs.getString(RegisteredFileSet.FOLDER_ID);
diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java
index 87f2391..75ec6dd 100644
--- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java
+++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java
@@ -97,7 +97,10 @@ public abstract class AbstractProfiledDocumentsTests extends BasicServiceTestUni
 		return doc;
 	}
 
-
+	protected void delete(String id) throws Exception {
+		check(baseTarget().path(id).request(MediaType.APPLICATION_JSON).
+				delete(), null);
+	}
 	
 	
 	protected Project update(String id, Document newContent)throws Exception {
diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java
index eb735fe..baf1d21 100644
--- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java
+++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java
@@ -61,12 +61,28 @@ public class DummyProjectTest extends AbstractProfiledDocumentsTests{
     @Test
     public void testUploadFileSet() throws Exception {
         assumeTrue(GCubeTest.isTestInfrastructureEnabled());
+
+        Project doc = createWithFileSet();
+        JSONPathWrapper wrapper = new JSONPathWrapper(doc.getTheDocument().toJson());
+        assertTrue("Relazione exists",wrapper.getMatchingPaths("section").size()==1);
+        RegisteredFileSet fs = Serialization.convert(wrapper.getByPath("section.fileset").get(0),RegisteredFileSet.class);
+        assertTrue(fs.getPayloads().size()==1);
+        assertTrue(fs.getString("customField").equals("customFieldValue"));
+    }
+
+
+    @Test
+    public void testDelete() throws Exception {
+        assumeTrue(GCubeTest.isTestInfrastructureEnabled());
+        delete(createWithFileSet().getId());
+    }
+
+
+    private Project createWithFileSet() throws Exception {
         Document baseDoc=new Document();
         baseDoc.put("section",new Document("title","My Title"));
 
         Project doc = createNew(baseDoc);
-        assertTrue(doc.getTheDocument().containsKey("section"));
-
 
         // Try set releazione scavo
         String parentPath="section";
@@ -86,13 +102,7 @@ public class DummyProjectTest extends AbstractProfiledDocumentsTests{
                 new Document("customField","customFieldValue"),
                 RegisterFileSetRequest.ClashOptions.REPLACE_EXISTING,
                 filename);
-
-        JSONPathWrapper wrapper = new JSONPathWrapper(doc.getTheDocument().toJson());
-        assertTrue("Relazione exists",wrapper.getMatchingPaths(parentPath).size()==1);
-        RegisteredFileSet fs = Serialization.convert(wrapper.getByPath(parentPath+"."+fieldName).get(0),RegisteredFileSet.class);
-        assertTrue(fs.getPayloads().size()==1);
-        assertTrue(fs.getString("customField").equals("customFieldValue"));
-
+        return doc;
     }
 
 //    @Test