Modify some tests to match OpenJDK 8