More tests, and better argument checking