Improved test speed