Consolidate some test namespaces.