Fix failing tests due to improperly scoped helper