javadoc and some tests