Remove internal usage of have

Not strictly related to the original PR #810 but these also need changing
given the removal of have from core (or using the gem but I'm ok with
refactoring them)