Fix #150. Validate ExtraHeaders. Modify test