Namespace and test fixes