Modify to return sub-command arguments
Fix test case