Updated javadoc
Updated tests