Modified code and test cases to use alt-location-independent URIs for metadata entities