Updated JUnit tests to use latest versions and work with the Java 8
updated code.