I've added a couple of more tests and better error message checks.