new pending test and code tidy