Upgrade tests to use JDK8