Improved performance of tests