Header tests patch up. Some got broken