Added tests for calendar