Add a few extra tests - more to do.