- fix different issues with header handling
- add extra test to check header handling