Namespacing changes
Fix tests