A couple of extra test cases and logic