Consolidated methods that build/add headers
Use the methods and changed value/header names in tests to work with consolidated methods
Formatting