SEC-2230: Fix Header tests