Fixes and enhances performance tests