Sort out the namespace in the tests.