Re: Cleaning up the test-* namespaces