Add NamespaceManager and other tests