Undoing some changes that I made to Event Testing to that it doesn't conflict with changes other people made to the same thing