diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4328501c..a56be00a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,6 +57,14 @@ jobs:
           path: |
            !**/bootable-jar-build-artifacts/**
            **/dev-watch-test-output.txt
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: project-src-${{ matrix.os }}-${{ matrix.java }}
+          path: |
+           !**/bootable-jar-build-artifacts/**
+           **/tests/target/devwatch*/src/**
+           **/tests/target/devwatch*/target/deployments/**
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
diff --git a/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchBootableJarMojo.java b/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchBootableJarMojo.java
index 176dc892..574177ea 100644
--- a/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchBootableJarMojo.java
+++ b/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchBootableJarMojo.java
@@ -1299,6 +1299,7 @@ private void shutdownContainer() {
                     ServerHelper.shutdownStandalone(client, timeout);
                 } catch (Throwable ignore) {
                     process.destroy();
+                    getLog().warn("Server process has been destroyed due to raised exception when shutting down the server. Exception: " + ignore);
                 }
                 try {
                     if (!process.waitFor(timeout, TimeUnit.SECONDS)) {
diff --git a/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/AbstractDevWatchTestCase.java b/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/AbstractDevWatchTestCase.java
index f62a5d8b..6fea615e 100644
--- a/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/AbstractDevWatchTestCase.java
+++ b/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/AbstractDevWatchTestCase.java
@@ -154,7 +154,8 @@ public void run() {
 
     @Override
     public void shutdownServer() throws Exception {
-        super.shutdownServerAsync();
+        // Do not initiate shutdown, when the mvn process will exit, shutdown hook will shutdown any running server
+        //super.shutdownServerAsync();
 
         if (process != null) {
             if (retCode != null) {
diff --git a/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchTestCase.java b/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchTestCase.java
index 88f05a57..fcb9e2e6 100644
--- a/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchTestCase.java
+++ b/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/DevWatchTestCase.java
@@ -92,14 +92,24 @@ public void testDevWatchWeb() throws Exception {
         assertTrue(pollBodyContent(url, expectedNewContent));
 
         Thread.sleep(3000);
-        // Update Java file and check that previous resources update is reflected
+        // In some very rare cases we got an empty resource file in the expoded deployment.
+        // Allthough in the previous check the resource file has been tested to be updated.
+        // This is a cause of test instability that we are removing with a simpler use-case, make a change to the resource file
+        // to force again having it updated.
+        // Update Java file and check that resources update is reflected
+        String testMsg2 = " The test2!";
+        props.setProperty("msg", testMsg2);
+        try (FileOutputStream output = new FileOutputStream(resourcesFile.toFile())) {
+            props.store(output, null);
+        }
+        Thread.sleep(3000);
         javaFile = getTestDir().resolve("src").resolve("main").resolve("java").
                 resolve("org").resolve("wildfly").resolve("plugins").resolve("demo").resolve("jaxrs").resolve("HelloWorldEndpoint.java");
         str = new String(Files.readAllBytes(javaFile), "UTF-8");
         radical = "Hi guys ";
         patchedRadical = "FOOFOO ";
         str = str.replace(radical, patchedRadical);
-        expectedNewContent = patchedRadical + testMsg;
+        expectedNewContent = patchedRadical + testMsg2;
         Files.write(javaFile, str.getBytes());
 
         assertTrue(pollBodyContent(url, expectedNewContent));
diff --git a/tests/src/test/resources/projects/jaxrs/src/main/java/org/wildfly/plugins/demo/jaxrs/HelloWorldEndpoint.java b/tests/src/test/resources/projects/jaxrs/src/main/java/org/wildfly/plugins/demo/jaxrs/HelloWorldEndpoint.java
index a1c8509b..4bca10f7 100644
--- a/tests/src/test/resources/projects/jaxrs/src/main/java/org/wildfly/plugins/demo/jaxrs/HelloWorldEndpoint.java
+++ b/tests/src/test/resources/projects/jaxrs/src/main/java/org/wildfly/plugins/demo/jaxrs/HelloWorldEndpoint.java
@@ -20,6 +20,7 @@ public Response doGet() throws IOException {
             props = new Properties();
             props.load(inputStream);
         }
+        System.out.println("CLASSLOADER " + HelloWorldEndpoint.class.getClassLoader());
         InputStream inputStream2 = HelloWorldEndpoint.class.getResourceAsStream("/myresources2.properties");
         Properties props2 = null;
         if (inputStream2 != null) {
@@ -30,7 +31,9 @@ public Response doGet() throws IOException {
                 inputStream2.close();
             }
         }
-
+        for(String k : props.stringPropertyNames()) {
+            System.out.println("KEY " + k + "=" + props.getProperty(k));
+        }
         //return Response.ok("Hello from " + "XXXWildFly bootable jar!").build();
         return Response.ok("Hello from " + props.getProperty("msg") + (props2 == null ? "" : " " + props2.getProperty("msg"))).build();
     }