Make header test less fragile