Adjusting expected results.
Switching to CentOS as main aka touchstone build.
Adding headers and adjusting test.