Improve tests performance