Fix a test that had a weird expected value, and some changes to align with latest cdk