Merge "100% test coverage for NamespaceInfo"