Refactored and replaced pending test