Clean up namespacing in test suite