diff --git a/AUTHORS.txt b/AUTHORS.txt
index 9a5e4bc..d7c02be 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -9,3 +9,4 @@ Sakari Hoisko            Dockerized linux env with X
 Juho Lehtonen            Optimized docker environment.
 Juho Saarinen            Package improvements, initial monocle support, screenshot bug fix
 Turo Soisenniemi         Initial java agent support
+Jari Parviainen          Latest Java 8 version changes   
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ec9144e..4899915 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.robotframework</groupId>
     <artifactId>javafxlibrary</artifactId>
     <packaging>jar</packaging>
-    <version>0.7.1</version>
+    <version>0.7.1-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmockit.version>1.44</jmockit.version>
@@ -59,6 +59,12 @@
             <organization>Eficode</organization>
             <organizationUrl>http://www.eficode.com</organizationUrl>
         </developer>
+        <developer>
+            <name>Jari Parviainen</name>
+            <email>jari.parviainen@eficode.com</email>
+            <organization>Eficode</organization>
+            <organizationUrl>http://www.eficode.com</organizationUrl>
+        </developer>
     </developers>
 
     <issueManagement>
@@ -80,7 +86,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>3.3.0</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -93,7 +99,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <version>3.6.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -107,7 +113,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <version>3.4.0</version>
                         <executions>
                             <execution>
                                 <id>attach-artifacts</id>
@@ -133,7 +139,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -185,7 +191,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.1.2</version>
                 <configuration>
                     <argLine>
                         -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
@@ -195,7 +201,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -205,7 +211,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -214,7 +220,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -237,7 +243,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -260,7 +266,26 @@
             <plugin>
                 <groupId>org.robotframework</groupId>
                 <artifactId>robotframework-maven-plugin</artifactId>
-                <version>1.7.1</version>
+                <version>2.1.0</version>
+                <configuration>
+                    <includes>
+                        <include>smoke</include>
+                    </includes>
+                    <!-- <tests>
+                        <test>Capture Node</test>
+                    </tests> -->
+                    <excludes>
+                        <exclude>not-ready</exclude>
+                    </excludes>
+                    <nonCriticalTags>
+                        <nonCriticalTag>monocle-issue</nonCriticalTag>
+                    </nonCriticalTags>
+                    <logLevel>TRACE:INFO</logLevel>
+                    <dryrun>false</dryrun>
+                    <variables>
+                        <variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
+                    </variables>
+                </configuration>
                 <executions>
                     <execution>
                         <id>acceptance tests</id>
@@ -268,22 +293,6 @@
                         <goals>
                             <goal>run</goal>
                         </goals>
-                        <configuration>
-                            <includes>
-                                <include>smoke</include>
-                            </includes>
-                            <excludes>
-                                <exclude>not-ready</exclude>
-                            </excludes>
-                            <nonCriticalTags>
-                                <nonCriticalTag>monocle-issue</nonCriticalTag>
-                            </nonCriticalTags>
-                            <logLevel>TRACE:INFO</logLevel>
-                            <dryrun>false</dryrun>
-                            <variables>
-                                <variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
-                            </variables>
-                        </configuration>
                     </execution>
                     <execution>
                         <id>documentation</id>
@@ -320,7 +329,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.5.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -370,7 +379,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.6.3</version>
+            <version>3.9.4</version>
         </dependency>
         <dependency>
             <groupId>org.jmockit</groupId>
@@ -381,12 +390,17 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
         </dependency>
         <dependency>
             <groupId>org.testfx</groupId>
             <artifactId>testfx-core</artifactId>
-            <version>4.0.16-alpha</version>
+            <version>4.0.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testfx</groupId>
+            <artifactId>testfx-junit</artifactId>
+            <version>4.0.17</version>
         </dependency>
         <dependency>
             <groupId>org.testfx</groupId>
@@ -401,7 +415,7 @@
         <dependency>
             <groupId>org.robotframework</groupId>
             <artifactId>robotframework</artifactId>
-            <version>3.2.1</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -416,12 +430,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.13.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/WaitForEventsInFxApplicationThreadTest.java b/src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/WaitForEventsInFxApplicationThreadTest.java
index 440fa03..e79a329 100644
--- a/src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/WaitForEventsInFxApplicationThreadTest.java
+++ b/src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/WaitForEventsInFxApplicationThreadTest.java
@@ -19,7 +19,7 @@
 
 import javafx.application.Platform;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.keywords.AdditionalKeywords.ApplicationLauncher;
 import org.junit.Assert;
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class WaitForEventsInFxApplicationThreadTest extends TestFxAdapterTest {
+public class WaitForEventsInFxApplicationThreadTest extends ApplicationTest {
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
diff --git a/src/test/java/javafxlibrary/matchers/InstanceOfMatcherTest.java b/src/test/java/javafxlibrary/matchers/InstanceOfMatcherTest.java
index 8c58e09..4adb4d1 100644
--- a/src/test/java/javafxlibrary/matchers/InstanceOfMatcherTest.java
+++ b/src/test/java/javafxlibrary/matchers/InstanceOfMatcherTest.java
@@ -19,11 +19,11 @@
 
 import javafx.scene.control.Button;
 import javafx.scene.text.Text;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class InstanceOfMatcherTest extends TestFxAdapterTest {
+public class InstanceOfMatcherTest extends ApplicationTest {
 
     @Test
     public void matchesWithClass() {
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/CallMethodTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/CallMethodTest.java
index 11788c7..b7115c7 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/CallMethodTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/CallMethodTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.control.Button;
 import javafx.stage.Stage;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.utils.HelperFunctions;
 import org.junit.Assert;
@@ -15,7 +15,7 @@
 import static testutils.TestFunctions.setupStageInJavaFXThread;
 import static testutils.TestFunctions.waitForEventsInJavaFXThread;
 
-public class CallMethodTest extends TestFxAdapterTest {
+public class CallMethodTest extends ApplicationTest {
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/GetAllNodesTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/GetAllNodesTest.java
index 704509f..f4959bc 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/GetAllNodesTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/GetAllNodesTest.java
@@ -6,7 +6,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.utils.HelperFunctions;
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,7 +15,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class GetAllNodesTest extends TestFxAdapterTest {
+public class GetAllNodesTest extends ApplicationTest {
 
     private List<Node> children = new ArrayList<>();
 
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/IsCompatibleTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/IsCompatibleTest.java
index 8a3acc2..e26c109 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/IsCompatibleTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/IsCompatibleTest.java
@@ -1,14 +1,14 @@
 package javafxlibrary.utils.HelperFunctionsTests;
 
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.utils.HelperFunctions;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.ArrayList;
 
-public class IsCompatibleTest extends TestFxAdapterTest {
+public class IsCompatibleTest extends ApplicationTest {
 
     @Test
     public void isCompatible_TestAllValidTypes() {
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java
index 02a3b80..392b848 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.finder.Finder;
@@ -15,7 +15,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class ObjectToNodeTest extends TestFxAdapterTest {
+public class ObjectToNodeTest extends ApplicationTest {
 
     @Mocked
     private Finder finder;
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ParseClassTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ParseClassTest.java
index d369ee2..4a6b3bd 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ParseClassTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ParseClassTest.java
@@ -1,6 +1,6 @@
 package javafxlibrary.utils.HelperFunctionsTests;
 
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.utils.HelperFunctions;
 import org.junit.Assert;
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class ParseClassTest extends TestFxAdapterTest {
+public class ParseClassTest extends ApplicationTest {
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/PrintTreeStructureTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/PrintTreeStructureTest.java
index c692178..7206e7b 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/PrintTreeStructureTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/PrintTreeStructureTest.java
@@ -4,7 +4,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.utils.HelperFunctions;
 import org.junit.After;
 import org.junit.Assert;
@@ -14,7 +14,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-public class PrintTreeStructureTest extends TestFxAdapterTest {
+public class PrintTreeStructureTest extends ApplicationTest {
 
     private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
     private final PrintStream originalOut = System.out;
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitForProgressBarToFinishTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitForProgressBarToFinishTest.java
index 9101006..23ecf30 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitForProgressBarToFinishTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitForProgressBarToFinishTest.java
@@ -1,7 +1,7 @@
 package javafxlibrary.utils.HelperFunctionsTests;
 
 import javafx.scene.control.ProgressBar;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.utils.HelperFunctions;
 import org.junit.Before;
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class WaitForProgressBarToFinishTest extends TestFxAdapterTest {
+public class WaitForProgressBarToFinishTest extends ApplicationTest {
 
     private ProgressBar progressBar;
 
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDisabledTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDisabledTest.java
index bf60d5e..35fdad2 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDisabledTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDisabledTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.Mock;
@@ -13,7 +13,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class WaitUntilDisabledTest extends TestFxAdapterTest {
+public class WaitUntilDisabledTest extends ApplicationTest {
 
     private Button button;
 
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDoesNotExistsTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDoesNotExistsTest.java
index 700c076..82457a5 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDoesNotExistsTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDoesNotExistsTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.finder.Finder;
@@ -13,7 +13,7 @@
 import org.junit.rules.ExpectedException;
 import testutils.DelayedObjectRemoval;
 
-public class WaitUntilDoesNotExistsTest extends TestFxAdapterTest {
+public class WaitUntilDoesNotExistsTest extends ApplicationTest {
 
     @Mocked
     private Finder finder;
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilEnabledTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilEnabledTest.java
index 240b707..43580bf 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilEnabledTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilEnabledTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.Mock;
@@ -10,7 +10,7 @@
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 
-public class WaitUntilEnabledTest extends TestFxAdapterTest {
+public class WaitUntilEnabledTest extends ApplicationTest {
 
     private Button button;
 
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilInvisibleTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilInvisibleTest.java
index 71829d5..5df8796 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilInvisibleTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilInvisibleTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.Mock;
@@ -13,7 +13,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class WaitUntilInvisibleTest extends TestFxAdapterTest {
+public class WaitUntilInvisibleTest extends ApplicationTest {
 
     private Button button;
 
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilVisibleTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilVisibleTest.java
index ddb6bc7..ab57c6b 100644
--- a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilVisibleTest.java
+++ b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilVisibleTest.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafxlibrary.TestFxAdapterTest;
+import org.testfx.framework.junit.ApplicationTest;
 import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.Mock;
@@ -10,7 +10,7 @@
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 
-public class WaitUntilVisibleTest extends TestFxAdapterTest {
+public class WaitUntilVisibleTest extends ApplicationTest {
 
     private Button button;