Fixing namespacing of tests.
Merge branch 'release/patching-test-namespace'