Java 8 tests fixed