Non-blocking - I see this in all of these tests - is asserting that the headers are not None something that can be rolled into `validate_headers`?  Maybe a different PR, or not at all, because this is fine as is.