Refactoring tests namespaces