Rearranged test namespaces.