some more HeaderTest fixed