artf689763 : Performance Test Refactoring