Sort out synchronous tests