Fix namespaces + update unit test