Fix expression-in-conditional templating bug
Fix scrape_header tests