more improvements of performance tests