Fix namespace issues with tests.