CDK-619: Added tests