Fix some Ransack-related test breakage. Also, a cleaner implementation of event merging that should preserve entry chronology.