More changes to get everything to best header tests.