diff --git a/etc/deploy-server.wsdd b/etc/deploy-server.wsdd
index d28a821..c69f2bc 100644
--- a/etc/deploy-server.wsdd
+++ b/etc/deploy-server.wsdd
@@ -6,7 +6,7 @@
     xmlns:aggr="http://mds.globus.org/aggregator/types">
 
     <service name="gcube/informationsystem/registry/Registry" provider="Handler" use="literal" style="document">
-        <parameter name="className" value="org.gcube.informationsystem.registry.impl.Registry"/>
+        <parameter name="className" value="org.gcube.informationsystem.registry.impl.porttypes.Registry"/>
 		<wsdlFile>share/schema/org.gcube.informationsystem.registry/Registry_service.wsdl</wsdlFile>
 		<parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
@@ -19,7 +19,7 @@
 	 
     <!-- Factory service -->
     <service name="gcube/informationsystem/registry/RegistryFactory" provider="Handler" use="literal" style="document">
-        <parameter name="className" value="org.gcube.informationsystem.registry.impl.RegistryFactory"/>
+        <parameter name="className" value="org.gcube.informationsystem.registry.impl.porttypes.RegistryFactory"/>
         <wsdlFile>share/schema/org.gcube.informationsystem.registry/RegistryFactory_service.wsdl</wsdlFile>
         <parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
diff --git a/etc/profile.xml b/etc/profile.xml
index fcde6a6..c8edd7d 100644
--- a/etc/profile.xml
+++ b/etc/profile.xml
@@ -64,7 +64,18 @@
 				<Files>
 					<File>org.gcube.informationsystem.registry.stubs.jar</File>
 				</Files>
-			</Software>           
+			</Software> 
+			<Software>
+				<Description>Test-suite for IS-Registry: provide sample interaction usages with an IS-Registry instance</Description>
+				<Name>IS-Registry-test-suite</Name>
+				<Version>1.0.0</Version>
+				<MultiVersion value="true"/>				
+				<Shareable level="VO"/>				
+				<Type>application</Type>
+				<Files>
+					<File>lib/org.gcube.informationsystem.registry.testsuite.jar</File>
+				</Files>
+			</Software>          
         </Packages>
     </Profile>
 </Resource>
diff --git a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
index e2b417a..27efc49 100644
--- a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
+++ b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
@@ -19,7 +19,7 @@ import org.gcube.common.core.utils.events.GCUBEProducer;
 import org.gcube.common.core.utils.events.GCUBETopic;
 import org.gcube.common.core.utils.handlers.GCUBEHandler;
 import org.gcube.common.core.utils.handlers.GCUBEScheduledHandler;
-import org.gcube.informationsystem.registry.impl.RegistryFactory;
+import org.gcube.informationsystem.registry.impl.porttypes.RegistryFactory;
 import org.gcube.informationsystem.registry.impl.resourcemanagement.EliminatePoolingThread;
 import org.gcube.informationsystem.registry.impl.state.RegistryFactoryResource;
 import org.gcube.informationsystem.registry.stubs.CreateResourceMessage;
diff --git a/src/org/gcube/informationsystem/registry/impl/Registry.java b/src/org/gcube/informationsystem/registry/impl/porttypes/Registry.java
similarity index 95%
rename from src/org/gcube/informationsystem/registry/impl/Registry.java
rename to src/org/gcube/informationsystem/registry/impl/porttypes/Registry.java
index 42de42f..6161d8b 100644
--- a/src/org/gcube/informationsystem/registry/impl/Registry.java
+++ b/src/org/gcube/informationsystem/registry/impl/porttypes/Registry.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.registry.impl;
+package org.gcube.informationsystem.registry.impl.porttypes;
 
 import org.apache.axis.utils.XMLUtils;
 import org.gcube.common.core.contexts.GCUBEServiceContext;
diff --git a/src/org/gcube/informationsystem/registry/impl/RegistryFactory.java b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java
similarity index 99%
rename from src/org/gcube/informationsystem/registry/impl/RegistryFactory.java
rename to src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java
index 29d29d6..1e973a2 100644
--- a/src/org/gcube/informationsystem/registry/impl/RegistryFactory.java
+++ b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.registry.impl;
+package org.gcube.informationsystem.registry.impl.porttypes;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
diff --git a/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java b/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java
index 17a48da..bf4cf09 100644
--- a/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java
+++ b/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java
@@ -13,7 +13,7 @@ import org.gcube.common.core.informationsystem.client.ISClient.ISMalformedQueryE
 import org.gcube.common.core.informationsystem.client.queries.GCUBEGenericQuery;
 import org.gcube.common.core.resources.GCUBERunningInstance;
 import org.gcube.common.core.utils.logging.GCUBELog;
-import org.gcube.informationsystem.registry.impl.RegistryFactory;
+import org.gcube.informationsystem.registry.impl.porttypes.RegistryFactory;
 import org.gcube.informationsystem.registry.impl.contexts.ServiceContext;
 import org.gcube.informationsystem.registry.stubs.RemoveResourceMessage;
 
diff --git a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java
index 55a8ea5..3774494 100644
--- a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java
+++ b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java
@@ -140,7 +140,7 @@ public class RegistryRegistrationTest {
 	 */
 	static void printUsage() {
 		System.out
-				.println("RegistryRegistrationTest <factory URI> <resource file> <resource type> <caller scope>");
+				.println("RegistryRegistrationTest <factory URI> <resource file> <caller scope> <resource type>");
 		System.out
 				.println("allowed types are: RunningInstance/Service/GHN/GenericResource");
 		System.exit(1);
diff --git a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java
index 7d8c7ae..c2f37ea 100644
--- a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java
+++ b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java
@@ -41,12 +41,11 @@ public class RegistryRemoveTest {
 			message.setType(args[3]);
 			message.setUniqueID(args[1]);
 			registryFactoryPortType.removeResource(message);
-
+			System.out.println("Profile with ID " + args[1]	+ "has been succesfully removed");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		System.out.println("Profile with ID " + args[1]
-				+ "has been succesfully removed");
+		
 	}
 
 }
diff --git a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java
index 606107c..8593d41 100644
--- a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java
+++ b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java
@@ -46,10 +46,10 @@ public static void main (String[]args ) throws Exception {
 				message.setType(GCUBEService.TYPE);
 				
 				registryFactoryPortType.updateResource(message);
-         
+				System.out.println("Profile has been updated");
 			} catch(Exception e) { 
 				e.printStackTrace();
 		}
-		System.out.println("Profile has been updated");
+		
 	}
 }
diff --git a/test-suite/README.TXT b/test-suite/README.TXT
index 2f416f3..3d2b430 100644
--- a/test-suite/README.TXT
+++ b/test-suite/README.TXT
@@ -4,7 +4,12 @@ Decription
 A client for the IS Registry allowing to add/delete profiles from the IS
 
 Usage
-source <script name>  <resource ID>/<profile file>
+source removeGCUBEResource.sh <RegistryFactory URI> <resource ID> <scope> <resource type>
+source registerGCUBEResource.sh <RegistryFactory URI> <profile file> <scope> <resource type>
+
+Example
+source removeGCUBEResource.sh http://node4.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory 778ba410-8d94-11de-889b-bed95c57e445 /d4science.research-infrastructures.eu/EM RunningInstance
+source registerGCUBEResource.sh http://node4.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory ./samples/RIProfile.xml /d4science.research-infrastructures.eu/EM RunningInstance
 
 Author Manuele Simi
-Last Update 30/09/2009
+Last Update 16/10/2009
diff --git a/test-suite/registerGUBEResource.sh b/test-suite/registerGUBEResource.sh
new file mode 100755
index 0000000..791195f
--- /dev/null
+++ b/test-suite/registerGUBEResource.sh
@@ -0,0 +1 @@
+java -cp ./org.gcube.informationsystem.registry.stubs.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest $1 $2 $3 $4
\ No newline at end of file
diff --git a/test-suite/registerGenericResourceICIS.sh b/test-suite/registerGenericResourceICIS.sh
deleted file mode 100755
index 94637ea..0000000
--- a/test-suite/registerGenericResourceICIS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.stubs.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS GenericResource
diff --git a/test-suite/removeGHND4ScienceFCPPS.sh b/test-suite/removeGHND4ScienceFCPPS.sh
deleted file mode 100755
index e9ed29c..0000000
--- a/test-suite/removeGHND4ScienceFCPPS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS GHN
diff --git a/test-suite/removeGHND4ScienceICIS.sh b/test-suite/removeGHND4ScienceICIS.sh
deleted file mode 100755
index b7bd69b..0000000
--- a/test-suite/removeGHND4ScienceICIS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH  org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS GHN
diff --git a/test-suite/removeGHNFCPPS.sh b/test-suite/removeGHNFCPPS.sh
deleted file mode 100755
index f235593..0000000
--- a/test-suite/removeGHNFCPPS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS GHN
diff --git a/test-suite/removeGUBEResource.sh b/test-suite/removeGUBEResource.sh
new file mode 100755
index 0000000..e9eaedc
--- /dev/null
+++ b/test-suite/removeGUBEResource.sh
@@ -0,0 +1 @@
+java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest $1 $2 $3 $4
\ No newline at end of file
diff --git a/test-suite/removeGenericResourceFCPPS.sh b/test-suite/removeGenericResourceFCPPS.sh
deleted file mode 100755
index 1a226e3..0000000
--- a/test-suite/removeGenericResourceFCPPS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS GenericResource
diff --git a/test-suite/removeGenericResourceICIS.sh b/test-suite/removeGenericResourceICIS.sh
deleted file mode 100755
index 085a837..0000000
--- a/test-suite/removeGenericResourceICIS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS GenericResource
diff --git a/test-suite/removeRID4ScienceFCPPS.sh b/test-suite/removeRID4ScienceFCPPS.sh
deleted file mode 100755
index 38ff52b..0000000
--- a/test-suite/removeRID4ScienceFCPPS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS RunningInstance
diff --git a/test-suite/removeRID4ScienceICIS.sh b/test-suite/removeRID4ScienceICIS.sh
deleted file mode 100755
index eac0b46..0000000
--- a/test-suite/removeRID4ScienceICIS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS RunningInstance
diff --git a/test-suite/removeRIFCPPS.sh b/test-suite/removeRIFCPPS.sh
deleted file mode 100755
index 38ff52b..0000000
--- a/test-suite/removeRIFCPPS.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS RunningInstance
diff --git a/test-suite/registerGenericResource.sh b/test-suite/samples/registerGenericResource.sh
similarity index 100%
rename from test-suite/registerGenericResource.sh
rename to test-suite/samples/registerGenericResource.sh
diff --git a/test-suite/registerRIEM.sh b/test-suite/samples/registerRIEM.sh
similarity index 100%
rename from test-suite/registerRIEM.sh
rename to test-suite/samples/registerRIEM.sh
diff --git a/test-suite/removeAllServicesD4Science.sh b/test-suite/samples/removeAllServicesD4Science.sh
similarity index 100%
rename from test-suite/removeAllServicesD4Science.sh
rename to test-suite/samples/removeAllServicesD4Science.sh
diff --git a/test-suite/removeGHND4Science.sh b/test-suite/samples/removeGHND4Science.sh
similarity index 100%
rename from test-suite/removeGHND4Science.sh
rename to test-suite/samples/removeGHND4Science.sh
diff --git a/test-suite/removeGHND4ScienceEM.sh b/test-suite/samples/removeGHND4ScienceEM.sh
similarity index 100%
rename from test-suite/removeGHND4ScienceEM.sh
rename to test-suite/samples/removeGHND4ScienceEM.sh
diff --git a/test-suite/removeGHND4ScienceFARM.sh b/test-suite/samples/removeGHND4ScienceFARM.sh
similarity index 100%
rename from test-suite/removeGHND4ScienceFARM.sh
rename to test-suite/samples/removeGHND4ScienceFARM.sh
diff --git a/test-suite/removeGHNTesting.sh b/test-suite/samples/removeGHNTesting.sh
similarity index 100%
rename from test-suite/removeGHNTesting.sh
rename to test-suite/samples/removeGHNTesting.sh
diff --git a/test-suite/removeGHNgCube.sh b/test-suite/samples/removeGHNgCube.sh
similarity index 100%
rename from test-suite/removeGHNgCube.sh
rename to test-suite/samples/removeGHNgCube.sh
diff --git a/test-suite/removeGHNgCubeDevSec.sh b/test-suite/samples/removeGHNgCubeDevSec.sh
similarity index 100%
rename from test-suite/removeGHNgCubeDevSec.sh
rename to test-suite/samples/removeGHNgCubeDevSec.sh
diff --git a/test-suite/removeGenericResourceD4Science.sh b/test-suite/samples/removeGenericResourceD4Science.sh
similarity index 100%
rename from test-suite/removeGenericResourceD4Science.sh
rename to test-suite/samples/removeGenericResourceD4Science.sh
diff --git a/test-suite/removeGenericResourceD4ScienceFARM.sh b/test-suite/samples/removeGenericResourceD4ScienceFARM.sh
similarity index 100%
rename from test-suite/removeGenericResourceD4ScienceFARM.sh
rename to test-suite/samples/removeGenericResourceD4ScienceFARM.sh
diff --git a/test-suite/removeGenericResourceDevSec.sh b/test-suite/samples/removeGenericResourceDevSec.sh
similarity index 100%
rename from test-suite/removeGenericResourceDevSec.sh
rename to test-suite/samples/removeGenericResourceDevSec.sh
diff --git a/test-suite/removeGenericResourceEM.sh b/test-suite/samples/removeGenericResourceEM.sh
similarity index 100%
rename from test-suite/removeGenericResourceEM.sh
rename to test-suite/samples/removeGenericResourceEM.sh
diff --git a/test-suite/removeGenericResourceTesting.sh b/test-suite/samples/removeGenericResourceTesting.sh
similarity index 100%
rename from test-suite/removeGenericResourceTesting.sh
rename to test-suite/samples/removeGenericResourceTesting.sh
diff --git a/test-suite/removeMCDevSec.sh b/test-suite/samples/removeMCDevSec.sh
similarity index 100%
rename from test-suite/removeMCDevSec.sh
rename to test-suite/samples/removeMCDevSec.sh
diff --git a/test-suite/removeMCEM.sh b/test-suite/samples/removeMCEM.sh
similarity index 100%
rename from test-suite/removeMCEM.sh
rename to test-suite/samples/removeMCEM.sh
diff --git a/test-suite/removeRID4Science.sh b/test-suite/samples/removeRID4Science.sh
similarity index 100%
rename from test-suite/removeRID4Science.sh
rename to test-suite/samples/removeRID4Science.sh
diff --git a/test-suite/removeRID4ScienceEM.sh b/test-suite/samples/removeRID4ScienceEM.sh
similarity index 100%
rename from test-suite/removeRID4ScienceEM.sh
rename to test-suite/samples/removeRID4ScienceEM.sh
diff --git a/test-suite/removeRIgCube.sh b/test-suite/samples/removeRIgCube.sh
similarity index 100%
rename from test-suite/removeRIgCube.sh
rename to test-suite/samples/removeRIgCube.sh
diff --git a/test-suite/removeRIgCubeDevSec.sh b/test-suite/samples/removeRIgCubeDevSec.sh
similarity index 100%
rename from test-suite/removeRIgCubeDevSec.sh
rename to test-suite/samples/removeRIgCubeDevSec.sh
diff --git a/test-suite/removeServicegCube.sh b/test-suite/samples/removeServicegCube.sh
similarity index 100%
rename from test-suite/removeServicegCube.sh
rename to test-suite/samples/removeServicegCube.sh
diff --git a/test-suite/removeServicegCubeDevSec.sh b/test-suite/samples/removeServicegCubeDevSec.sh
similarity index 100%
rename from test-suite/removeServicegCubeDevSec.sh
rename to test-suite/samples/removeServicegCubeDevSec.sh