Fix and cleanup performance test