Play with timings to see if that fixes tests