Extend replay tests