make EventSavingTest work after big model changes