Refactored test code to reduce copy/paste
Implemented handing of single argument
Added two more tests to make sure the single arg/param case is good