Refactor header validator spec
Fix cli runner