Improved test speeds