refactored unit test names and namespaces