Merges SorterTest and TestUtil namespaces, removes unused files