Test fix plus javadoc update