Ensure multiple argument inputs handled safely, update tests.