diff --git a/src/java/net/i2p/i2pfirefox/I2PBrowser.java b/src/java/net/i2p/i2pfirefox/I2PBrowser.java
index ac5a8af..e1143dd 100644
--- a/src/java/net/i2p/i2pfirefox/I2PBrowser.java
+++ b/src/java/net/i2p/i2pfirefox/I2PBrowser.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 public class I2PBrowser {
     private final I2PFirefox i2pFirefox = new I2PFirefox();
     private final I2PChromium i2pChromium = new I2PChromium();
+    private final I2PGenericUnsafeBrowser i2pGeneral = new I2PGenericUnsafeBrowser();
     public boolean firefox = false;
     public boolean chromium = false;
     public boolean chromiumFirst = false;
@@ -35,6 +36,10 @@ public class I2PBrowser {
         System.out.println("I2PChromium");
         i2pChromium.launch(privateWindow, url);
     }
+    private void launchGeneric(boolean privateWindow, String[] url) {
+        System.out.println("I2PChromium");
+        i2pGeneral.launch(privateWindow, url);
+    }
  
     /**
      * Construct an I2PBrowser class which automatically determines which browser to use.
@@ -92,6 +97,8 @@ public class I2PBrowser {
                 this.launchFirefox(privateWindow, url);
             } else if (this.hasChromium()) {
                 this.launchChromium(privateWindow, url);
+            }else{
+                this.launchGeneric(privateWindow, url);
             }
             return;
         }
@@ -100,6 +107,8 @@ public class I2PBrowser {
                 this.launchChromium(privateWindow, url);
             }else if (firefox) {
                 this.launchFirefox(privateWindow, url);
+            }else{
+                this.launchGeneric(privateWindow, url);
             }
             return;
         }
@@ -107,6 +116,8 @@ public class I2PBrowser {
             this.launchFirefox(privateWindow, url);
         }else if (chromium) {
             this.launchChromium(privateWindow, url);
+        }else{
+            this.launchGeneric(privateWindow, url);
         }
         return;
     }
diff --git a/src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java b/src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java
index 2ca1a28..86a2254 100644
--- a/src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java
+++ b/src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java
@@ -5,8 +5,6 @@ import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Scanner;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * I2PChromiumProfileChecker.java
diff --git a/test-unsafe.sh b/test-unsafe.sh
index 162f829..6013e2a 100755
--- a/test-unsafe.sh
+++ b/test-unsafe.sh
@@ -4,4 +4,12 @@ ant distclean
 ant jar
 
 echo "Testing UNSAFE auto-selector with no private and no URL parameters."
-java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser 2> gen.0.err 1> gen.0.log
\ No newline at end of file
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser 2> gen.0.err 1> gen.0.log
+echo "Testing UNSAFE auto-selector with local URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser "http://127.0.0.1:7657" 2> gen.1.err 1> gen.1.log
+echo "Testing UNSAFE auto-selector with remote URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser "http://idk.i2p" 2> gen.2.err 1> gen.2.log
+echo "Testing UNSAFE auto-selector with private browsing parameter"
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser -private "http://127.0.0.1:7657" 2> gen.3.err 1> gen.3.log
+
+echo "UNSAFE browser tests complete"
\ No newline at end of file
diff --git a/test.sh b/test.sh
index dc12eb4..9f851f8 100755
--- a/test.sh
+++ b/test.sh
@@ -3,16 +3,22 @@
 ant distclean
 ant jar
 
+rm -rf i2p.chromium.base.profile i2p.chromium.profile i2p.firefox.base.profile i2p.firefox.profile
+
 echo "Testing auto-selector with no private and no URL parameters."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser 2> auto.0.err 1> auto.0.log
 echo "Testing auto-selector with local URL parameter."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser "http://127.0.0.1:7657" 2> auto.1.err 1> auto.1.log
 echo "Testing auto-selector with remote URL parameter."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser "http://idk.i2p" 2> auto.2.err 1> auto.2.log
+echo "Testing auto-selector with remote AND local URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser "http://127.0.0.1:7657" "http://idk.i2p" 2> auto.3.err 1> auto.3.log
 echo "Testing auto-selector with private browsing parameter"
-java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -private "http://127.0.0.1:7657" 2> auto.3.err 1> auto.3.log
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -private "http://127.0.0.1:7657" 2> auto.4.err 1> auto.4.log
 
 echo "Auto-Selector tests completed"
+sleep 2s
+rm -rf i2p.chromium.base.profile i2p.chromium.profile
 
 echo "Testing Chromium with no private and no URL parameters."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -chromium 2> chrome.1.err 1> chrome.1.log
@@ -20,10 +26,14 @@ echo "Testing Chromium with local URL parameter."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -chromium "http://127.0.0.1:7657" 2> chrome.1.err 1> chrome.1.log
 echo "Testing Chromium with remote URL parameter."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -chromium "http://idk.i2p" 2> chrome.2.err 1> chrome.2.log
+echo "Testing Chromium with remote AND local URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -chromium "http://127.0.0.1:7657" "http://idk.i2p" 2> fox.3.err 1> fox.3.log
 echo "Testing Chromium with private browsing parameter"
-java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -chromium -private "http://127.0.0.1:7657" 2> chrome.3.err 1> chrome.3.log
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -chromium -private "http://127.0.0.1:7657" 2> chrome.4.err 1> chrome.4.log
 
 echo "Chromium tests completed"
+sleep 2s
+rm -rf i2p.firefox.base.profile i2p.firefox.profile
 
 echo "Testing Firefox with no private and no URL parameters."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -firefox 2> fox.0.err 1> fox.0.log
@@ -31,7 +41,24 @@ echo "Testing Firefox with local URL parameter."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -firefox "http://127.0.0.1:7657" 2> fox.1.err 1> fox.1.log
 echo "Testing Firefox with remote URL parameter."
 java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -firefox "http://idk.i2p" 2> fox.2.err 1> fox.2.log
+echo "Testing Firefox with remote AND local URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -firefox "http://127.0.0.1:7657" "http://idk.i2p" 2> fox.3.err 1> fox.3.log
 echo "Testing Firefox with private browsing parameter"
-java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -firefox -private "http://127.0.0.1:7657" 2> fox.3.err 1> fox.3.log
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser -firefox -private "http://127.0.0.1:7657" 2> fox.4.err 1> fox.4.log
 
 echo "Firefox tests completed"
+sleep 2s
+rm -rf i2p.chromium.base.profile i2p.chromium.profile i2p.firefox.base.profile i2p.firefox.profile
+
+echo "Testing UNSAFE auto-selector with no private and no URL parameters."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser 2> gen.0.err 1> gen.0.log
+echo "Testing UNSAFE auto-selector with local URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser "http://127.0.0.1:7657" 2> gen.1.err 1> gen.1.log
+echo "Testing UNSAFE auto-selector with remote URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser "http://idk.i2p" 2> gen.2.err 1> gen.2.log
+echo "Testing UNSAFE auto-selector with remote AND local URL parameter."
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser "http://127.0.0.1:7657" "http://idk.i2p" 2> gen.3.err 1> gen.3.log
+echo "Testing UNSAFE auto-selector with private browsing parameter"
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PGenericUnsafeBrowser -private "http://127.0.0.1:7657" 2> gen.4.err 1> gen.4.log
+
+echo "UNSAFE browser tests complete"