CAS-1406: Fixed test cases.