diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/queries/templates/ResourceRegistryQueryTemplateClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/queries/templates/ResourceRegistryQueryTemplateClientTest.java
index 74fc2a8..4355542 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/queries/templates/ResourceRegistryQueryTemplateClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/queries/templates/ResourceRegistryQueryTemplateClientTest.java
@@ -110,9 +110,14 @@ public class ResourceRegistryQueryTemplateClientTest extends ContextTest {
 	
 	protected QueryTemplate update(QueryTemplate queryTemplate) throws ResourceRegistryException, IOException {
 		list(queryTemplate);
+		
+		queryTemplate.setDescription(QUERY_TEMPLATE_DESCRIPTION_UPDATED);
 		QueryTemplate updatedQueryTemplate = resourceRegistryQueryTemplateClient.update(queryTemplate);
 		assertions(queryTemplate, updatedQueryTemplate);
 		list(updatedQueryTemplate);
+		
+		// Restoring Previous description on queryTemplate
+		queryTemplate.setDescription(QUERY_TEMPLATE_DESCRIPTION);
 		return updatedQueryTemplate;
 	}
 	
@@ -216,19 +221,21 @@ public class ResourceRegistryQueryTemplateClientTest extends ContextTest {
 	@Test
 	public void completeTest() throws Exception {
 		try {
-			QueryTemplate queryTemplate = getQueryTemplate();
+			// Cleaning the environment in case of a previous error interrupted the tests
+			resourceRegistryQueryTemplateClient.delete(QUERY_TEMPLATE_NAME);
 			
+			QueryTemplate queryTemplate = getQueryTemplate();
+						
 			QueryTemplate createdQueryTemplate = create(queryTemplate);
 			
 			QueryTemplate readQueryTemplate = read(createdQueryTemplate);
 			
-			readQueryTemplate.setDescription(QUERY_TEMPLATE_DESCRIPTION_UPDATED);
 			QueryTemplate updatedQueryTemplate = update(readQueryTemplate);
 			
 			QueryTemplate readUpdatedQueryTemplate = read(updatedQueryTemplate);
 			
 			delete(readUpdatedQueryTemplate);
-		}catch (Exception e) {
+		}catch (Throwable e) {
 			resourceRegistryQueryTemplateClient.delete(QUERY_TEMPLATE_NAME);
 		}
 		logger.debug("The DB should be now clean");