update test and javadoc