Let the tests breather and rearrange