I say leave the tests AS-IS. That way we can compare historically to see how improved vehicles are from previous models.
BUT also include a third number, the average actual fuel economy in a new test that is based on a sample of cars driven by commuters, similar to what is collected as data here.
Then people will realize both that people drive like idiots on the average, and that the car is capable of much better.
