javadoc improvements and additional tests