Bug 444243 - Improve scripts to handle performance tests