Add tests for calendar