Provisionally fix some tests which are broken because of removal of SaveSystemChanges