Improve test speed