namespaces fixes in tests