Altered Populator to allow multiple sort fields; cleaned up some tests