Fix some more tests related to headpin