fixed headpin-related test failures