Fix tests
Remove _ and . from uris