Test fixes and namespaces

Add namespace, Fix unit tests