Fix test suite performance