improved performance tests