Namespace refactoring for tests