Use 'command line' instead of config() call

It's awful, but consistent
Add tests for header addition