Change -r, -m, and -p to use nargs='+' to support multiple arguments.
Fix tests to support multiple arguments.
Rename a unit test that was covering up another test.