Disambiguate and shore up namespace tests