More tests for calendar model spec
More refactorings and tests
Scope refactoring for events and adding tests