Fix quoting of cli args in wrapper script to properly expand arguments.

[bloodearnest]

Also, fix some issue with the tests, and use this to test that multiple args are passed