Fix tests after field order change