Add extra tests