CDK-197: Fixing cdk-tools test after adding generic.