Tidied up and amended namespacing in test suite