Migrated to M3 version of the language
Fixed failing tests caused by the migration