Refactor contributions events and write tests for calendar