Improved tests speed