Changed namespaces for unit test classes