Removed old code
Fix namespacing on test suite