finshed event controller tests refactor