Fix parser test. Refine header inclusion.