Small bugfixes in drive test