Improved tests performance