Fixing tests namespacing