Commiting changes to events so that Dan has to resolve the conflicts :)
Fixed event tests to use eventID instead of names, which may not be unique