fix unflakeable imports