javadoc, renamings and more tests