CAS-1430: Added test cases