Merge "Improve namespace handling in tests"