Refactored Performance Tests