Add tests for issue 5113
Complete PR 2376
move tests to test_args
Merge pull request #7451 from smichr/new_pr_2376

New pr 2376