Improved javadoc + introduced the NoClusterFoundException + added the test