Added catching of errors in test cases so they're not silent.
Fixed bug with multiple plus signs in argument values.
Merge branch 'Feuermurmel/master'
Fix tests.