finally make replay tests work