diff --git a/dhp-workflows/dhp-enrichment/src/test/java/eu/dnetlib/dhp/bulktag/CommunityConfigurationFactoryTest.java b/dhp-workflows/dhp-enrichment/src/test/java/eu/dnetlib/dhp/bulktag/CommunityConfigurationFactoryTest.java
index aaf670fd7..3d08b5915 100644
--- a/dhp-workflows/dhp-enrichment/src/test/java/eu/dnetlib/dhp/bulktag/CommunityConfigurationFactoryTest.java
+++ b/dhp-workflows/dhp-enrichment/src/test/java/eu/dnetlib/dhp/bulktag/CommunityConfigurationFactoryTest.java
@@ -30,7 +30,7 @@ public class CommunityConfigurationFactoryTest {
 			.toString(
 				getClass()
 					.getResourceAsStream(
-						"/eu/dnetlib/dhp/communityconfiguration/community_configuration.xml"));
+						"/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration.xml"));
 		final CommunityConfiguration cc = CommunityConfigurationFactory.newInstance(xml);
 		Assertions.assertEquals(5, cc.size());
 		cc
@@ -57,7 +57,7 @@ public class CommunityConfigurationFactoryTest {
 			.toString(
 				getClass()
 					.getResourceAsStream(
-						"/eu/dnetlib/dhp/communityconfiguration/community_configuration_selcrit.xml"));
+						"/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml"));
 		final CommunityConfiguration cc = CommunityConfigurationFactory.newInstance(xml);
 		Map<String, List<String>> param = new HashMap<>();
 		param.put("author", new ArrayList<>(Collections.singletonList("Pippo Pippi")));
@@ -81,86 +81,5 @@ public class CommunityConfigurationFactoryTest {
 		Assertions.assertEquals(1, comm.size());
 		Assertions.assertEquals("dariah", comm.get(0));
 	}
-
-	@Test
-	public void test4() throws DocumentException, IOException {
-		final CommunityConfiguration cc = CommunityConfigurationFactory
-			.fromJson(
-				IOUtils
-					.toString(
-						getClass()
-							.getResourceAsStream(
-								"/eu/dnetlib/dhp/communityconfiguration/community_configuration_selcrit.json")));
-		cc.toString();
-	}
-
-	@Test
-	public void test5() throws IOException, DocumentException {
-
-		// final CommunityConfiguration cc =
-		// CommunityConfigurationFactory.newInstance(IOUtils.toString(getClass().getResourceAsStream("test.xml")));
-		final CommunityConfiguration cc = CommunityConfigurationFactory
-			.fromJson(
-				IOUtils
-					.toString(
-						getClass()
-							.getResourceAsStream(
-								"/eu/dnetlib/dhp/communityconfiguration/community_configuration.json")));
-
-		System.out.println(cc.toJson());
-	}
-
-	@Test
-	public void test6() {
-		String json = "{\"criteria\":[{\"constraint\":[{\"verb\":\"contains\",\"field\":\"contributor\",\"value\":\"DARIAH\"}]}]}";
-
-		String step1 = "{\"verb\":\"contains\",\"field\":\"contributor\",\"value\":\"DARIAH\"}";
-
-		Constraint c = new Gson().fromJson(step1, Constraint.class);
-		//
-		// String step2 =
-		// "{\"constraint\":[{\"verb\":\"contains\",\"field\":\"contributor\",\"value\":\"DARIAH\"}]}";
-		//
-		// ConstraintEncapsulator ce = new
-		// Gson().fromJson(step2,ConstraintEncapsulator.class);
-		//
-		//
-		// String step3 =
-		// "{\"ce\":{\"constraint\":[{\"verb\":\"contains\",\"field\":\"contributor\",\"value\":\"DARIAH\"}]}}";
-		//
-		// Constraints cons = new Gson().fromJson(step3,Constraints.class);
-		//
-		// String step4 =
-		// "{\"criteria\":[{\"ce\":{\"constraint\":[{\"verb\":\"contains\",\"field\":\"contributor\",\"value\":\"DARIAH\"}]}}]}";
-		//
-		// ConstraintsList cl = new Gson().fromJson(step4,ConstraintsList.class);
-		//
-		// String step5 =
-		// "{\"cl\":{\"criteria\":[{\"ce\":{\"constraint\":[{\"verb\":\"contains\",\"field\":\"contributor\",\"value\":\"DARIAH\"}]}}]}}";
-		SelectionConstraints sl = new Gson().fromJson(json, SelectionConstraints.class);
-	}
-
-	@Test
-	public void test7() throws IOException {
-		final CommunityConfiguration cc = CommunityConfigurationFactory
-			.fromJson(
-				IOUtils
-					.toString(
-						getClass()
-							.getResourceAsStream(
-								"/eu/dnetlib/dhp/communityconfiguration/tagging_conf.json")));
-
-		System.out.println(cc.toJson());
-	}
-
-	@Test
-	public void temporaneo() throws Exception {
-		String xml = IOUtils
-			.toString(
-				getClass()
-					.getResourceAsStream(
-						"/eu/dnetlib/dhp/communityconfiguration/tagging_conf.xml"));
-		final CommunityConfiguration cc = CommunityConfigurationFactory.newInstance(xml);
-		System.out.println(cc.toJson());
-	}
+	
 }
diff --git a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml
index 89ace0e5f..cd5ea38d0 100644
--- a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml
+++ b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml
@@ -35,7 +35,7 @@
             <subject>SDG9 - Industry innovation and infrastructure</subject>
             <subject>SDG16 - Peace justice and strong institutions</subject>
         </subjects>
-        <providers/>
+        <datasources/>
         <zenodocommunities>
             <zenodocommunity>
                 <zenodoid>123</zenodoid>
@@ -50,7 +50,7 @@
     </community>
     <community id="fam">
         <subjects/>
-        <providers/>
+        <datasources/>
         <zenodocommunities/>
     </community>
     <community id="ni">
@@ -74,7 +74,7 @@
             <subject>brain magnetic resonance imaging</subject>
             <subject>brain abnormalities</subject>
         </subjects>
-        <providers>
+        <datasources>
             <datasource>
                 <openaireId>re3data_____::5b9bf9171d92df854cf3c520692e9122</openaireId>
                 <selcriteria/>
@@ -95,7 +95,7 @@
                 <openaireId>doajarticles::0c0e74daa5d95504eade9c81ebbd5b8a</openaireId>
                 <selcriteria/>
             </datasource>
-        </providers>
+        </datasources>
         <zenodocommunities/>
     </community>
     <community id="mes">
@@ -106,12 +106,12 @@
             <subject>aqua</subject>
             <subject>sea</subject>
         </subjects>
-        <providers>
+        <datasources>
             <datasource>
                 <openaireId>re3data_____::9633d1e8c4309c833c2c442abeb0cfeb</openaireId>
                 <selcriteria/>
             </datasource>
-        </providers>
+        </datasources>
         <zenodocommunities/>
     </community>
     <community id="aginfra">
@@ -134,7 +134,7 @@
             <subject>food distribution</subject>
             <subject>forestry</subject>
         </subjects>
-        <providers>
+        <datasources>
             <datasource>
                 <openaireId>opendoar____::1a551829d50f1400b0dab21fdd969c04</openaireId>
                 <selcriteria/>
@@ -159,30 +159,30 @@
                 <openaireId>opendoar____::87ae6fb631f7c8a627e8e28785d9992d</openaireId>
                 <selcriteria/>
             </datasource>
-        </providers>
+        </datasources>
         <zenodocommunities/>
     </community>
     <community id="clarin">
         <oacommunity>oac_clarin</oacommunity>
         <subjects/>
-        <providers>
+        <datasources>
             <datasource>
                 <openaireId>re3data_____::a507cdacc5bbcc08761c92185dee5cab</openaireId>
                 <selcriteria/>
             </datasource>
-        </providers>
+        </datasources>
         <zenodocommunities/>
     </community>
     <community id="dariah">
         <oacommunity>oaa_dariah</oacommunity>
         <subjects/>
-        <providers>
+        <datasources>
             <datasource>
                 <openaireId>openaire____::1cfdb2e14977f31a98e0118283401f32</openaireId>
                 <selcriteria>{"criteria":[{"constraint":[{"verb":"contains","field":"contributor","value":"DARIAH"}]}]}
                 </selcriteria>
             </datasource>
-        </providers>
+        </datasources>
         <zenodocommunities>
             <zenodocommunity>
                 <zenodoid>dimpo</zenodoid>