diff --git a/bin/generate-test.mjs b/bin/generate-test.mjs
index 18b0639..5984c7f 100755
--- a/bin/generate-test.mjs
+++ b/bin/generate-test.mjs
@@ -27,7 +27,7 @@
 
         const responseString = "HTTP 200\n" + response.getBody();
 
-        return requestString + "\n" + responseString;
+        return requestString + responseString + "\n";
     } catch (error) {
         console.error(error);
         return requestString + "\n";
@@ -51,18 +51,17 @@
             console.error(`Request "${i}" not found.\nMaybe the examples.http file is wrong?`);
             continue;
         }
-        hurlString += await restCliRequest2Hurl(request) +
-            '\n\n';
+        hurlString += await restCliRequest2Hurl(request) + '\n';
     }
     return hurlString.trim();
 }
 
 ///////////////////////////////////////////////////////////:
 
-const [, , instanceName, requestName] = process.argv;
+const [, , instancePath, requestName] = process.argv;
 
-if (!instanceName) {
-    console.error("Instance name needed as a first paramater!");
+if (!instancePath) {
+    console.error("Instance path needed as a first paramater!");
     usage(1);
 }
 
@@ -73,7 +72,10 @@
 
 // Get Response from examples.http file
 const parser = new RestParser();
-await parser.readFile(`./${instanceName}/examples.http`);
+await parser.readFile(`./${instancePath}/examples.http`);
+
+const instanceName = instancePath.replace(/\/$/, '').split('/').pop();
+console.error(`Instance "${instanceName}" found.`);
 
 // Convert all requests
 if (process.argv.length === 3) {