Added javadoc
Renamed test