Added more automatic updates of the Ir in the resolver

Also edited Ir instances and test files