Improve test runtime