Update tests to reflect new header names