Javadoc added and Unit tests added