Improved test coverage of argument parsing