Fixed failing tests, removed occurrences from Events#index