CDK-713: Clearer messages in the tests.