Fixed unit test to match changes in URI/URL parsing and new format support