Bringing tests up to speed with latest type family changes