Refactored original test