Fix JavaDOCs for Java8
Better output from tests.