improved tests performance