Add tests for extra headers in format-patch