Fix headers not getting set for --server-type=http, and update tests