Fix broken tests that were not namespace-aware