Fixed up unittests for drive.py.