Update e2e tests

- Tweak things on win for settings combinations which might
  work with all trouble you're getting from win versions and
  node-pty, etc.
- Relates #401

e2e/spring-shell-e2e-tests/test/builtin.test.ts

@@ -41,31 +41,10 @@ describe('builtin commands', () => {
     cli?.dispose();
   }, testTimeout);
 
-  /**
-   * native commands
-   */
-  describe(nativeDesc, () => {
-    beforeAll(() => {
-      command = nativeCommand;
-    });
-
-    it(
-      versionReturnsInfoDesc,
-      async () => {
-        cli = new Cli({
-          command: command,
-          options: [...options, ...versionCommand]
-        });
-        await versionReturnsInfo(cli);
-      },
-      testTimeout
-    );
-  });
-
   /**
    * fatjar commands
    */
-  describe(jarDesc, () => {
+   describe(jarDesc, () => {
     beforeAll(() => {
       command = jarCommand;
       options = jarOptions;
@@ -83,4 +62,26 @@ describe('builtin commands', () => {
       testTimeout
     );
   });
+
+  /**
+   * native commands
+   */
+  describe(nativeDesc, () => {
+    beforeAll(() => {
+      command = nativeCommand;
+      options = [];
+    });
+
+    it(
+      versionReturnsInfoDesc,
+      async () => {
+        cli = new Cli({
+          command: command,
+          options: [...options, ...versionCommand]
+        });
+        await versionReturnsInfo(cli);
+      },
+      testTimeout
+    );
+  });
 });

e2e/spring-shell-e2e-tests/test/flow.test.ts

@@ -65,27 +65,6 @@ describe('flow commands', () => {
     cli?.dispose();
   }, testTimeout);
 
-  /**
-   * native commands
-   */
-  describe(nativeDesc, () => {
-    beforeAll(() => {
-      command = nativeCommand;
-    });
-
-    it(
-      flowConditionalField2SkipsFields1Desc,
-      async () => {
-        cli = new Cli({
-          command: command,
-          options: [...options, ...flowConditionalCommand]
-        });
-        await flowConditionalField2SkipsFields1(cli);
-      },
-      testTimeout
-    );
-  });
-
   /**
    * fatjar commands
    */
@@ -107,4 +86,26 @@ describe('flow commands', () => {
       testTimeout
     );
   });
+
+  /**
+   * native commands
+   */
+   describe(nativeDesc, () => {
+    beforeAll(() => {
+      command = nativeCommand;
+      options = [];
+    });
+
+    it(
+      flowConditionalField2SkipsFields1Desc,
+      async () => {
+        cli = new Cli({
+          command: command,
+          options: [...options, ...flowConditionalCommand]
+        });
+        await flowConditionalField2SkipsFields1(cli);
+      },
+      testTimeout
+    );
+  });
 });