Style/Py3 fixes in test_driver