Re-order and added pending test