Fixed more tests, added ReplySorterTest