Tidy tests
Add argument error handling.