Added a couple extra test cases