In some cases, the name is null, but the URI is still correct
Cleanup some tests