Extracted support code to enable more test namespaces