CDK-316: Reverted changes to TestConstraints