refactored test namespaces