CLDIDE-2162 Added tests and javadocs