updates to namespaces for test
Merge pull request #4 from owainlewis/master

Fixes for tests