CAS-1396: Fixed test failure and updated javadocs.