Add additional .calendar() tests, relocate