javadoc and test improvements