CDK-140: Add namespaces

I added tests for this behavior.