Enhanced Electric and Fuel Cell Vehicle Certification