Fixing test namespaces