(Maint) Bring the helper into this suite