Fixes for upgrade testing (#1987)#1987

kelemeno merged 5 commits intomainmatter-labs/era-contracts:mainfrom

kl/fixes-for-upgrade-testingmatter-labs/era-contracts:kl/fixes-for-upgrade-testingCopy head branch name to clipboard