Event model fully implemented, tests improved and passing