Added Javadoc + JUnit