Patched driver, tests not working yet.