Fixes to tests

Should fix buildbot tests concerning timeouts in driver launch tests.