Add javadoc and start on tests