diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
index 9c2786a..4040562 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
@@ -36,7 +36,7 @@ import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.gcube.informationsystem.resourceregistry.ContextTest;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.base.ElementManagement;
-import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtility;
+import org.gcube.informationsystem.resourceregistry.instances.model.ERManagementUtility;
 import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement;
@@ -748,7 +748,7 @@ public class ERManagementTest extends ContextTest {
 		requestInfo.setOffset(offset);
 		requestInfo.setLimit(limit);
 		
-		ElementManagement<?,?> erManagement = ElementManagementUtility.getERManagement(TypeUtility.getTypeName(clz));
+		ElementManagement<?,?> erManagement = ERManagementUtility.getERManagement(TypeUtility.getTypeName(clz));
 		String ret = erManagement.all(true);
 
 		List<ERElement> list = ElementMapper.unmarshalList(ERElement.class, ret);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java
index 17ae1f9..e85496a 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java
@@ -18,7 +18,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.reso
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entities.resource.ResourceNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.relations.RelationAvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.relations.isrelatedto.IsRelatedToNotFoundException;
-import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtility;
+import org.gcube.informationsystem.resourceregistry.instances.model.ERManagementUtility;
 import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement;
 import org.gcube.informationsystem.serialization.ElementMapper;
@@ -171,7 +171,7 @@ public class BasicTest extends MultiContextTest {
 		
 		String targetContextFullName = ALTERNATIVE_TEST_SCOPE;
 		
-		ResourceManagement rm = (ResourceManagement) ElementManagementUtility.getERManagement(Resource.NAME);
+		ResourceManagement rm = (ResourceManagement) ERManagementUtility.getERManagement(Resource.NAME);
 		String all = rm.all(true);
 		List<Resource> allResources = ElementMapper.unmarshalList(Resource.class, all);
 		Assert.assertTrue(allResources.size()==2);
@@ -180,7 +180,7 @@ public class BasicTest extends MultiContextTest {
 		
 		deleteResource(hostingNode);
 		
-		rm = (ResourceManagement) ElementManagementUtility.getERManagement(Resource.NAME);
+		rm = (ResourceManagement) ERManagementUtility.getERManagement(Resource.NAME);
 		all = rm.all(true);
 		allResources = ElementMapper.unmarshalList(Resource.class, all);
 		Assert.assertTrue(allResources.size()==0);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java
index eb41893..079de90 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java
@@ -15,8 +15,8 @@ import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.queries.InvalidQueryException;
 import org.gcube.informationsystem.resourceregistry.base.ElementManagement;
-import org.gcube.informationsystem.resourceregistry.base.ElementManagementUtility;
 import org.gcube.informationsystem.resourceregistry.instances.ERManagementTest;
+import org.gcube.informationsystem.resourceregistry.instances.model.ERManagementUtility;
 import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement;
@@ -90,7 +90,7 @@ public class QueryTest extends ERManagementTest {
 	
 			/* Getting all instances of created specific Resources */
 			for (String key : resources.keySet()) {
-				ResourceManagement resourceManagement = (ResourceManagement) ElementManagementUtility.getERManagement(key);
+				ResourceManagement resourceManagement = (ResourceManagement) ERManagementUtility.getERManagement(key);
 				String json = resourceManagement.all(false);
 	
 				List<Resource> list = ElementMapper.unmarshalList(Resource.class, json);
@@ -100,7 +100,7 @@ public class QueryTest extends ERManagementTest {
 	
 			/* Getting all Resources polymorphic and non polymorphic */
 	
-			ResourceManagement resourceManagement = (ResourceManagement) ElementManagementUtility
+			ResourceManagement resourceManagement = (ResourceManagement) ERManagementUtility
 					.getERManagement(Resource.NAME);
 	
 			String json = resourceManagement.all(true);
@@ -114,7 +114,7 @@ public class QueryTest extends ERManagementTest {
 	
 			/* Getting all IsRelatedTo polymorphic and non polymorphic */
 	
-			IsRelatedToManagement isRelatedToManagement = (IsRelatedToManagement) ElementManagementUtility
+			IsRelatedToManagement isRelatedToManagement = (IsRelatedToManagement) ERManagementUtility
 					.getERManagement(IsRelatedTo.NAME);
 	
 			json = isRelatedToManagement.all(true);
@@ -130,7 +130,7 @@ public class QueryTest extends ERManagementTest {
 	
 			/* Getting all ConsistsOf polymorphic and non polymorphic */
 	
-			ConsistsOfManagement consistsOfManagement = (ConsistsOfManagement) ElementManagementUtility
+			ConsistsOfManagement consistsOfManagement = (ConsistsOfManagement) ERManagementUtility
 					.getERManagement(ConsistsOf.NAME);
 	
 			json = consistsOfManagement.all(true);
@@ -298,7 +298,7 @@ public class QueryTest extends ERManagementTest {
 		String type = Service.NAME;
 		
 		@SuppressWarnings("rawtypes")
-		ElementManagement erManagement = ElementManagementUtility.getERManagement(type);
+		ElementManagement erManagement = ERManagementUtility.getERManagement(type);
 		
 		if (erManagement instanceof ResourceManagement) {
 			boolean[] booleans = new boolean[] {true, false};