Refactor and Add test for Event model
[Closes #36]