javadoc
tests fixed