Minor refactoring in Javadoc
Minor Javadoc refactoring
Added some tests