fixed unit tests and namespaces