javadoc update, tests updated