bugfix: If the test driver returned an error, it was ignored by the test script
Merge branch 'master' into issue217