#987 Calendar: Update and create new tests.