Add a couple extra tests