Merge with new performance tests