Fixed namespaces for tests