TRUNK-3903 modified the javadocs and added unit tests
TRUNK-3903 added and resolved the unit tests