Adds JavaDocs
Clean up tests