Add a few more test cases (from the man page)