The bigger problem in the US is that "commercial" vehicles are exempt from many of the regulations, and so manufacturers get a lot of their cars legally defined as "light trucks". Start treating businesses the same way as individuals.
I'm not a huge fan personally. If this is really something the country is interested in then just raise the gas tax and let people figure out how to respond to that.
Real-world testing scenarios, code review, and a corporate death penalty to follow it up would go a long way towards stopping them.
Note that I'm not trying to compare economic systems or argue for/against any particular economic system, just pointing out that the goal of capitalism is to make money, people inherently cheat and lie, so in a capitalistic society people will lie and cheat to make money. We all know this is true, which is why private companies are regulated by public agencies. The diesel cheating scandal was a failure of regulation enforcement more than anything.
(Depending on political preference you might choose to cut other taxes with the revenues, or refund them equally per capita or reduce the deficit.)