Fixed tests to reflect new headers