Fix test order flickering