Fix testsuite to handle tests that require multiple command line arguments.