Tidied up and amended namespacing in test suite
Merge pull request #3 from orno/development

Tidied up and amended namespacing in test suite