Better performance in the tests