Updated DriverModel and Tests