Added a few missing safeguards in the driver testsuite
Merge pull request #610 from stof/test_safeguard

Added a few missing safeguards in the driver testsuite