Fixed Merge Conflict in TestVehicle