Java 8 enabled + test unit updated