CDK-664: Simplified URI building, additional tests