Added most of the neccesary check-expects. Wish somebody else had done it...