Fix testdrive samples