Restructuring of sort_utils unit tests is under way ...