diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
index df09734..0b2803a 100644
--- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
+++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
@@ -205,7 +205,7 @@ public class TestRules {
 		ContextTest.setContextByName(ContextTest.DEFAULT_TEST_SCOPE);
 		initAllRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesFile = new File(rulesDirectory, "DataMiner-getCapabilities.json");
+		File rulesFile = new File(rulesDirectory, "geoanalytics-gos-ShapeManagement.json");
 		testRule(rulesFile);
 	}
 	
diff --git a/src/test/resources/rules/geoanalytics-gos-GeoserverManagement.csv b/src/test/resources/rules/geoanalytics-gos-GeoserverManagement.csv
new file mode 100644
index 0000000..b95782e
--- /dev/null
+++ b/src/test/resources/rules/geoanalytics-gos-GeoserverManagement.csv
@@ -0,0 +1,12 @@
+geoanalytics,geoanalytics-gos,/GeoserverManagement/addGeoserverLayer
+geoanalytics,geoanalytics-gos,/GeoserverManagement/addStyle
+geoanalytics,geoanalytics-gos,/GeoserverManagement/deleteGeoserverLayer/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/GeoserverManagement/deleteGeoserverLayer/{UUID_TO_REPLACE}/PostGIS
+geoanalytics,geoanalytics-gos,/GeoserverManagement/getAllStyles
+geoanalytics,geoanalytics-gos,/GeoserverManagement/getFeatureType/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/GeoserverManagement/getGeoserverLayer/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/GeoserverManagement/getGeoserverLayers
+geoanalytics,geoanalytics-gos,/GeoserverManagement/getLayerType/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/GeoserverManagement/initializeEnvironment
+geoanalytics,geoanalytics-gos,/GeoserverManagement/removeStyle
+geoanalytics,geoanalytics-gos,/GeoserverManagement/setDefaultLayerStyle
\ No newline at end of file
diff --git a/src/test/resources/rules/geoanalytics-gos-GeoserverManagement.json b/src/test/resources/rules/geoanalytics-gos-GeoserverManagement.json
new file mode 100644
index 0000000..5a74759
--- /dev/null
+++ b/src/test/resources/rules/geoanalytics-gos-GeoserverManagement.json
@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "geoanalytics",
+		"serviceNameRegex": "geoanalytics-gos",
+		"calledMethodRegex": ".*ShapeManagement.*"
+	},
+	"replace": {
+		"serviceClass": "geoanalytics",
+		"serviceName": "geoanalytics-gos",
+		"calledMethod": "ShapeManagement"
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/rules/geoanalytics-gos-ShapeManagement.csv b/src/test/resources/rules/geoanalytics-gos-ShapeManagement.csv
new file mode 100644
index 0000000..8274f4d
--- /dev/null
+++ b/src/test/resources/rules/geoanalytics-gos-ShapeManagement.csv
@@ -0,0 +1,7 @@
+geoanalytics,geoanalytics-gos,/ShapeManagement/existingLayerIDs
+geoanalytics,geoanalytics-gos,/ShapeManagement/applyOnView
+geoanalytics,geoanalytics-gos,/ShapeManagement/countShapesOfLayer/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/ShapeManagement/deleteLayer/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/ShapeManagement/getShapeByID/{UUID_TO_REPLACE}
+geoanalytics,geoanalytics-gos,/ShapeManagement/insertShapes
+geoanalytics,geoanalytics-gos,/ShapeManagement/shapesOfLayerID/{UUID_TO_REPLACE}
\ No newline at end of file
diff --git a/src/test/resources/rules/geoanalytics-gos-ShapeManagement.json b/src/test/resources/rules/geoanalytics-gos-ShapeManagement.json
new file mode 100644
index 0000000..2024630
--- /dev/null
+++ b/src/test/resources/rules/geoanalytics-gos-ShapeManagement.json
@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "geoanalytics",
+		"serviceNameRegex": "geoanalytics-gos",
+		"calledMethodRegex": ".*GeoserverManagement.*"
+	},
+	"replace": {
+		"serviceClass": "geoanalytics",
+		"serviceName": "geoanalytics-gos",
+		"calledMethod": "GeoserverManagement"
+	}
+}
\ No newline at end of file