diff --git a/src/test/java/org/gcube/resourcemanagement/model/DiscoveryTest.java b/src/test/java/org/gcube/resourcemanagement/model/DiscoveryTest.java
index 6b52f80..5f76800 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/DiscoveryTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/DiscoveryTest.java
@@ -2,8 +2,8 @@ package org.gcube.resourcemanagement.model;
 
 import org.gcube.informationsystem.base.reference.AccessType;
 import org.gcube.informationsystem.base.reference.Element;
+import org.gcube.informationsystem.discovery.knowledge.Knowledge;
 import org.gcube.informationsystem.discovery.knowledge.ModelKnowledge;
-import org.gcube.informationsystem.serialization.ElementMapper;
 import org.gcube.informationsystem.tree.Tree;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,8 +19,7 @@ public class DiscoveryTest {
 	
 	@Test
 	public void testDiscovery() throws Exception {
-		ModelKnowledge modelKnowledge = ElementMapper.getGlobalModelKnowledgeInstance();
-		modelKnowledge.createKnowledge();
+		ModelKnowledge modelKnowledge = Knowledge.getInstance().getAllKnowledge();
 		
 		AccessType[] accessTypes = AccessType.getModelTypes();
 		for(AccessType accessType : accessTypes) {
@@ -28,9 +27,6 @@ public class DiscoveryTest {
 			Tree<Class<Element>> classesTree = modelKnowledge.getClassesTree(accessType);
 			logger.info("Classes tree for {} is\n{}", accessType.getName(), classesTree.toString());
 			
-//			Tree<Type> typesTree = modelKnowledge.getTypesTree(accessType);
-//			logger.info("Types tree for {} is\n{}", accessType.getName(), typesTree.toString());
-			
 		}
 	}