Improve test reproducibility