fixed tests for inclusion of header in baseline
Merge remote-tracking branch 'origin/master'