Adds check for overriding headers
Fixes failing test, should be smarter about LF