Begin refactor of TestViewEventController