Refactored initial test