Javadoc + some more tests