new headers pass the headercheck now and the test looks better
move the grid output to the end of the test to print refinements too
[buildsystem] adjust to the new header structure
fix -Wreorder warnings