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

Conflicts:
	spec/factories.rb