Tweak tests in light of later changes to events