Added testing of the new headers functionality