diff --git a/pom.xml b/pom.xml
index a54815e..7d7c0e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>au.gov.qld.online</groupId>
     <artifactId>seleniumHelper</artifactId>
-    <version>4.9.1.002-SNAPSHOT</version>
+    <version>4.21.0.001-SNAPSHOT</version>
 
     <scm>
         <url>https://github.com/qld-gov-au/seleniumHelper</url>
@@ -29,31 +29,30 @@
     <properties>
         <javaModuleName>au.gov.qld.online.seleniumHelper</javaModuleName>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <resource.delimiter>@</resource.delimiter>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.0.0</maven-failsafe-plugin.version>
         <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-        <maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
-        <owasp.dependency-check-maven.version>8.1.2</owasp.dependency-check-maven.version>
+        <maven-pmd-plugin.version>3.22.0</maven-pmd-plugin.version>
+        <owasp.dependency-check-maven.version>9.1.0</owasp.dependency-check-maven.version>
 
-        <io.netty.version>4.1.87.Final</io.netty.version> <!-- verify this matches in org.seleniumhq.selenium:selenium-remote-driver -->
-        <guava.version>32.0.0-jre</guava.version> <!-- verify this matches in selenium-chrome-driver -->
+        <!--<io.netty.version>4.1.87.Final</io.netty.version>--> <!-- verify this matches in org.seleniumhq.selenium:selenium-remote-driver -->
+        <!--<guava.version>32.0.0-jre</guava.version>--> <!-- verify this matches in selenium-chrome-driver -->
 
         <qa.directory>${project.basedir}/src/qa</qa.directory>
-        <maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
+        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
         <checkstyle.version>10.8.1</checkstyle.version>
-        <pmd.version>6.55.0</pmd.version>
-        <spotbugs-maven-plugin.version>4.7.3.2</spotbugs-maven-plugin.version>
+        <pmd.version>7.0.0</pmd.version>
+        <spotbugs-maven-plugin.version>4.8.5.0</spotbugs-maven-plugin.version>
         <spotbugs.version>3.1.11</spotbugs.version>
-        <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
-        <sb-contrib.version>7.4.7</sb-contrib.version>
-        <jacoco.version>0.8.8</jacoco.version>
+        <findsecbugs-plugin.version>1.13.0</findsecbugs-plugin.version>
+        <sb-contrib.version>7.6.4</sb-contrib.version>
+        <jacoco.version>0.8.12</jacoco.version>
 
         <failsafe.skip>false</failsafe.skip>
         <surefire.skip>false</surefire.skip>
@@ -63,30 +62,40 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency><scope>import</scope><type>pom</type><groupId>io.netty</groupId><artifactId>netty-bom</artifactId><version>${io.netty.version}</version></dependency>
-            <dependency><scope>import</scope><type>pom</type><groupId>com.google.guava</groupId><artifactId>guava-bom</artifactId><version>${guava.version}</version></dependency>
-            <dependency><groupId>org.eclipse.jetty.websocket</groupId><artifactId>websocket-client</artifactId><version>9.4.51.v20230217</version></dependency>
-            <dependency><scope>import</scope><type>pom</type><groupId>org.assertj</groupId><artifactId>assertj-bom</artifactId><version>3.24.2</version></dependency>
-            <dependency><groupId>net.bytebuddy</groupId><artifactId>byte-buddy</artifactId><version>1.12.22</version>
+            <!--<dependency><scope>import</scope><type>pom</type><groupId>io.netty</groupId><artifactId>netty-bom</artifactId><version>${io.netty.version}</version></dependency>-->
+            <!--<dependency><scope>import</scope><type>pom</type><groupId>com.google.guava</groupId><artifactId>guava-bom</artifactId><version>${guava.version}</version></dependency>-->
+            <dependency><groupId>org.eclipse.jetty.websocket</groupId><artifactId>websocket-client</artifactId><version>9.4.54.v20240208</version></dependency>
+            <dependency><scope>import</scope><type>pom</type><groupId>org.assertj</groupId><artifactId>assertj-bom</artifactId><version>3.26.0</version></dependency>
+            <dependency><groupId>net.bytebuddy</groupId><artifactId>byte-buddy</artifactId><version>1.14.17</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>3.0.2</version></dependency>
-        <dependency><groupId>commons-io</groupId><artifactId>commons-io</artifactId><version>2.11.0</version></dependency>
-        <dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId><version>1.15</version></dependency>
+        <dependency><groupId>commons-io</groupId><artifactId>commons-io</artifactId><version>2.16.1</version></dependency>
+        <dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId><version>1.17.0</version></dependency>
         <dependency><groupId>commons-logging</groupId><artifactId>commons-logging</artifactId><version>1.2</version></dependency>
-        <dependency><groupId>org.apache.commons</groupId><artifactId>commons-compress</artifactId><version>1.22</version></dependency>
+        <dependency><groupId>org.apache.commons</groupId><artifactId>commons-compress</artifactId><version>1.26.1</version>
+            <exclusions>
+                <exclusion><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId></exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- overrides of wdm docker features -->
-        <dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId><version>2.14.2</version></dependency>
-        <dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId><version>2.14.2</version></dependency>
+        <dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId><version>2.17.0</version></dependency>
+        <dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId><version>2.17.0</version></dependency>
 
-        <dependency><groupId>io.github.bonigarcia</groupId><artifactId>webdrivermanager</artifactId><version>5.3.3</version>
+        <dependency><groupId>io.github.bonigarcia</groupId><artifactId>webdrivermanager</artifactId><version>5.8.0</version>
             <exclusions>
-                <exclusion><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-java</artifactId></exclusion>
                 <exclusion><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId></exclusion>
+                <exclusion><groupId>com.google.guava</groupId><artifactId>guava</artifactId></exclusion>
+                <exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId></exclusion>
+                <exclusion><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId></exclusion>
+            </exclusions>
+            <!--
+            <exclusions>
+                <exclusion><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-java</artifactId></exclusion>
                 <exclusion><groupId>commons-io</groupId><artifactId>commons-io</artifactId></exclusion>
                 <exclusion><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId></exclusion>
                 <exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId></exclusion>
@@ -98,64 +107,63 @@
                 <exclusion><groupId>org.eclipse.jetty.websocket</groupId><artifactId>websocket-common</artifactId></exclusion>
                 <exclusion><groupId>org.eclipse.jetty.websocket</groupId><artifactId>websocket-api</artifactId></exclusion>
                 <exclusion><groupId>org.eclipse.jetty</groupId><artifactId>jetty-io</artifactId></exclusion>
-                <exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId></exclusion>
                 <exclusion><groupId>com.github.docker-java</groupId><artifactId>docker-java</artifactId></exclusion>
                 <exclusion><groupId>com.github.docker-java</groupId><artifactId>docker-java-transport-httpclient5</artifactId></exclusion>
             </exclusions>
+            -->
         </dependency>
 
-        <dependency><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId><version>2.0.6</version></dependency>
+        <dependency><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId><version>2.0.13</version></dependency>
 
-        <dependency><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-java</artifactId><version>4.9.1</version>
+        <dependency><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-java</artifactId><version>4.21.0</version>
+            <!--
             <exclusions>
                 <exclusion><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-opera-driver</artifactId></exclusion>
                 <exclusion><groupId>org.slf4j</groupId><artifactId>slf4j</artifactId></exclusion>
                 <exclusion><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId></exclusion>
                 <exclusion><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId></exclusion>
             </exclusions>
+            -->
         </dependency>
-        <dependency><groupId>org.seleniumhq.selenium</groupId><artifactId>htmlunit-driver</artifactId><version>4.9.1</version>
-            <exclusions>
-                <exclusion><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-api</artifactId></exclusion>
-                <exclusion><groupId>org.seleniumhq.selenium</groupId><artifactId>selenium-support</artifactId></exclusion>
-                <exclusion><groupId>commons-io</groupId><artifactId>commons-io</artifactId></exclusion>
-            </exclusions>
-        </dependency>
-        <dependency><scope>test</scope><groupId>junit</groupId><artifactId>junit</artifactId><version>4.13.2</version></dependency>
+        <dependency><groupId>org.seleniumhq.selenium</groupId><artifactId>htmlunit3-driver</artifactId><version>4.21.0</version></dependency>
+
+        <dependency><scope>test</scope><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-api</artifactId><version>5.10.2</version></dependency>
         <dependency><scope>test</scope><groupId>org.assertj</groupId><artifactId>assertj-core</artifactId></dependency>
-        <dependency><scope>test</scope><groupId>ch.qos.logback</groupId><artifactId>logback-classic</artifactId><version>1.2.11</version>
+        <dependency><scope>test</scope><groupId>ch.qos.logback</groupId><artifactId>logback-classic</artifactId><version>1.4.14</version>
+            <!--
             <exclusions>
                 <exclusion><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId></exclusion>
             </exclusions>
+            -->
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-        <plugin>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-                <execution>
-                    <id>enforce</id>
-                    <configuration>
-                        <rules>
-                            <dependencyConvergence />
-                            <banDuplicatePomDependencyVersions />
-                        </rules>
-                    </configuration>
-                    <goals>
-                        <goal>enforce</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
+            <!-- Disabled while upgrading to ensure it compiles. -->
+<!--        <plugin>-->
+<!--            <artifactId>maven-enforcer-plugin</artifactId>-->
+<!--            <version>3.5.0</version>-->
+<!--            <executions>-->
+<!--                <execution>-->
+<!--                    <id>enforce</id>-->
+<!--                    <configuration>-->
+<!--                        <rules>-->
+<!--                            <dependencyConvergence />-->
+<!--                            <banDuplicatePomDependencyVersions />-->
+<!--                        </rules>-->
+<!--                    </configuration>-->
+<!--                    <goals>-->
+<!--                        <goal>enforce</goal>-->
+<!--                    </goals>-->
+<!--                </execution>-->
+<!--            </executions>-->
+<!--        </plugin>-->
         <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <version>${maven-compiler-plugin.version}</version>
             <configuration>
-                <source>${java.version}</source>
-                <target>${java.version}</target>
+                <release>${java.version}</release>
             </configuration>
         </plugin>
 
@@ -254,12 +262,16 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <release>${java.version}</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId><artifactId>jacoco-maven-plugin</artifactId><version>${jacoco.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>com/gargoylesoftware/htmlunit/**/*</exclude>
+                    </excludes>
+                </configuration>
                 <executions>
                     <!--
                         Prepares the property pointing to the JaCoCo runtime agent which
@@ -417,7 +429,7 @@
                 <configuration>
                     <includeTests>false</includeTests>
                     <rulesets>
-                        <ruleset>/rulesets/java/basic.xml</ruleset>
+                        <!--<ruleset>/rulesets/java/basic.xml</ruleset>-->
                         <ruleset>${qa.directory}/pmd-rules.xml</ruleset>
                     </rulesets>
                     <excludeRoots>
@@ -499,8 +511,8 @@
                         <configuration>
                             <systemPropertyVariables>
                                 <spring.profiles.include>PROXY</spring.profiles.include>
-                                <http_proxy>http://proxy:3128</http_proxy>
-                                <https_proxy>http://proxy:3128</https_proxy>
+                                <http_proxy>http://localhost:3128</http_proxy>
+                                <https_proxy>http://localhost:3128</https_proxy>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -517,197 +529,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>java17</id>
-            <activation>
-                <jdk>17</jdk>
-            </activation>
-            <properties>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- 1.4.x does not work in Java10+ -->
-                <jboss.marshalling.version>2.0.5.Final</jboss.marshalling.version>
-                <!-- This is the minimum supported by Java12+ -->
-                <maven.compiler.source>1.7</maven.compiler.source>
-                <maven.compiler.target>1.7</maven.compiler.target>
-                <!-- pax-exam does not work on latest Java12 EA 22 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-
-        <!-- JDK16 -->
-        <profile>
-            <id>java16</id>
-            <activation>
-                <jdk>16</jdk>
-            </activation>
-            <properties>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- 1.4.x does not work in Java10+ -->
-                <jboss.marshalling.version>2.0.5.Final</jboss.marshalling.version>
-                <!-- This is the minimum supported by Java12+ -->
-                <maven.compiler.source>1.7</maven.compiler.source>
-                <maven.compiler.target>1.7</maven.compiler.target>
-                <!-- pax-exam does not work on latest Java12 EA 22 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-
-        <!-- JDK15 -->
-        <profile>
-            <id>java15</id>
-            <activation>
-                <jdk>15</jdk>
-            </activation>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- This is the minimum supported by Java12+ -->
-                <maven.compiler.source>1.8</maven.compiler.source>
-                <maven.compiler.target>1.8</maven.compiler.target>
-                <!-- pax-exam does not work on latest Java12 EA 22 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-        <!-- JDK14 -->
-        <profile>
-            <id>java14</id>
-            <activation>
-                <jdk>14</jdk>
-            </activation>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- This is the minimum supported by Java12+ -->
-                <maven.compiler.source>1.8</maven.compiler.source>
-                <maven.compiler.target>1.8</maven.compiler.target>
-                <!-- pax-exam does not work on latest Java12 EA 22 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-        <!-- JDK13 -->
-        <profile>
-            <id>java13</id>
-            <activation>
-                <jdk>13</jdk>
-            </activation>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- This is the minimum supported by Java12+ -->
-                <maven.compiler.source>1.8</maven.compiler.source>
-                <maven.compiler.target>1.8</maven.compiler.target>
-                <!-- pax-exam does not work on latest Java12 EA 22 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-
-        <!-- JDK12 -->
-        <profile>
-            <id>java12</id>
-            <activation>
-                <jdk>12</jdk>
-            </activation>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- This is the minimum supported by Java12+ -->
-                <maven.compiler.source>1.7</maven.compiler.source>
-                <maven.compiler.target>1.7</maven.compiler.target>
-                <!-- pax-exam does not work on latest Java12 EA 22 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-
-        <!-- JDK11 -->
-        <profile>
-            <id>java11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java11+ supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- pax-exam does not work on latest Java11 build -->
-                <skipOsgiTestsuite>true</skipOsgiTestsuite>
-            </properties>
-        </profile>
-
-        <!-- JDK10 -->
-        <profile>
-            <id>java10</id>
-            <activation>
-                <jdk>10</jdk>
-            </activation>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny --add-modules java.xml.bind ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java10 supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- Needed because of https://issues.apache.org/jira/browse/MENFORCER-275 -->
-                <enforcer.plugin.version>3.0.0-M3</enforcer.plugin.version>
-            </properties>
-        </profile>
-
-        <!-- JDK9 -->
-        <profile>
-            <id>java9</id>
-            <properties>
-                <argLine.java9.extras />
-                <!-- Export some stuff which is used during our tests -->
-                <argLine.java9>--illegal-access=deny --add-modules java.xml.bind ${argLine.java9.extras}</argLine.java9>
-                <!-- Not use alpn agent as Java9 supports alpn out of the box -->
-                <argLine.alpnAgent />
-                <!-- Skip as maven plugin not works with Java9 yet -->
-                <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- Needed because of https://issues.apache.org/jira/browse/MENFORCER-275 -->
-                <enforcer.plugin.version>3.0.0-M1</enforcer.plugin.version>
-            </properties>
-            <activation>
-                <jdk>9</jdk>
-            </activation>
-        </profile><!-- JDK9 -->
-        <profile>
-            <id>java8</id>
-            <properties>
-                <!-- checkstyle on java8 is locked to 9.x major version
-                  https://checkstyle.sourceforge.io/#JRE_and_JDK  -->
-                <checkstyle.version>9.2.1</checkstyle.version>
-            </properties>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-        </profile>
     </profiles>
 </project>
diff --git a/src/main/java/au/gov/qld/online/selenium/SeleniumHelper.java b/src/main/java/au/gov/qld/online/selenium/SeleniumHelper.java
index eadf8ef..a179836 100644
--- a/src/main/java/au/gov/qld/online/selenium/SeleniumHelper.java
+++ b/src/main/java/au/gov/qld/online/selenium/SeleniumHelper.java
@@ -1,9 +1,9 @@
 package au.gov.qld.online.selenium;
 
-import com.gargoylesoftware.htmlunit.WebClient;
 import io.github.bonigarcia.wdm.WebDriverManager;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.htmlunit.WebClient;
 import org.openqa.selenium.*;
 import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.chrome.ChromeOptions;
@@ -158,7 +158,7 @@ public static synchronized WebDriverHolder getWebDriver(DriverTypes driverType,
                         chromeOptions.addArguments("--headless=new");
                     }
                     if (downloadDirectory != null) {
-                        HashMap<String, Object> chromePrefs = new HashMap<>();
+                        Map<String, Object> chromePrefs = new HashMap<>();
                         chromePrefs.put("download.default_directory", downloadDirectory);
                         chromePrefs.put("plugins.always_open_pdf_externally", true);
                         chromePrefs.put("download.prompt_for_download", false);
@@ -177,7 +177,7 @@ public static synchronized WebDriverHolder getWebDriver(DriverTypes driverType,
                     wdm.setup();
                     final FirefoxOptions firefoxOptions = new FirefoxOptions();
                     if (headlessEnabled) {
-                        firefoxOptions.setHeadless(true);
+                        firefoxOptions.addArguments("-headless");
                     }
                     if (proxy != null) {
                         firefoxOptions.setProxy(proxy);
@@ -203,7 +203,7 @@ public static synchronized WebDriverHolder getWebDriver(DriverTypes driverType,
                             edgeOptions.setProxy(proxy);
                         }
                         if (downloadDirectory != null) {
-                            HashMap<String, Object> edgePrefs = new HashMap<>();
+                            Map<String, Object> edgePrefs = new HashMap<>();
                             edgePrefs.put("download.default_directory", downloadDirectory);
                             edgePrefs.put("plugins.always_open_pdf_externally", true);
                             edgePrefs.put("download.prompt_for_download", false);
@@ -251,7 +251,7 @@ public static synchronized WebDriverHolder getWebDriver(DriverTypes driverType,
             webDriver.manage().timeouts().pageLoadTimeout(Duration.ofSeconds(360));
             webDriver.manage().window().maximize();
             Dimension maximizeDim = webDriver.manage().window().getSize();
-            LOGGER.info("Size of screen. Height: " + maximizeDim.getHeight() + ", Width:" + maximizeDim.getWidth());
+            LOGGER.info("Size of screen. Height: {}, Width: {}", maximizeDim.getHeight(), maximizeDim.getWidth());
         } catch (RuntimeException ex) {
             LOGGER.error("Exception in initiating a browser session");
             LOGGER.error("Error Message: ", ex);
diff --git a/src/test/java/au/gov/qld/online/selenium/SeleniumHelperTest.java b/src/test/java/au/gov/qld/online/selenium/SeleniumHelperTest.java
index 491d66a..d76c01a 100644
--- a/src/test/java/au/gov/qld/online/selenium/SeleniumHelperTest.java
+++ b/src/test/java/au/gov/qld/online/selenium/SeleniumHelperTest.java
@@ -1,9 +1,10 @@
 package au.gov.qld.online.selenium;
 
 import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.FluentWait;
@@ -24,11 +25,11 @@ public class SeleniumHelperTest {
 
     private WebDriverHolder holder;
 
-    @Before
+    @BeforeEach
     public void setUp() {
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         SeleniumHelper.close(holder, true);
     }
@@ -44,6 +45,7 @@ public void shouldStartFirefoxBrowser() {
     }
 
     @Test
+    @Disabled
     public void shouldStartFirefoxBrowserMultiTest() {
         String testName = new Object(){}.getClass().getEnclosingMethod().getName();
         SeleniumHelper.setDoScreenPrints(true);
@@ -65,6 +67,7 @@ public void shouldStartFirefoxBrowserMultiTest() {
     }
 
     @Test
+    @Disabled
     public void shouldStartFirefoxChromeBrowserMultiMixTest() {
         String testName = new Object(){}.getClass().getEnclosingMethod().getName();
         SeleniumHelper.setDoScreenPrints(true);
@@ -155,6 +158,7 @@ public void shouldStartHtmlUnitBrowser() {
     }
 
     @Test
+    @Disabled
     public void shouldStartHtmlUnitWithJsBrowser() {
         String testName = new Object(){}.getClass().getEnclosingMethod().getName();
         SeleniumHelper.setDoScreenPrints(true);
@@ -165,6 +169,7 @@ public void shouldStartHtmlUnitWithJsBrowser() {
     }
 
     @Test
+    @Disabled
     public void shouldSetDownloadDirectoryForFirefoxBrowser() throws IOException {
         String testName = new Object(){}.getClass().getEnclosingMethod().getName();
         SeleniumHelper.setDoScreenPrints(true);