fix models and all tests imported from SF after ArrayOf and MapOf changes.