adjustments for new cdk-tests
merge dev to cdk1.5