Slim up test cases for header generation
Merge pull request #3853 from 9rnsr/hdrgen_test

Slim up test cases for header generation