GENERAL - performance test refactoring