adjustments for new cdk-tests