Program name into error messages
Tidied up command line argument tests