Fix #34. Add more scenarios for header