Use xtend, test headerGenerator. Fixes #3