Update test to be more tolerant of rename event ordering