Fix tiq-test argument parsing
Merge pull request #46 from davidski/combine_args_fix

Fix tiq-test argument parsing