Fixes in namespaces / unit tests