Updated TestPerformance and associated code for the latest release