CLC-3988 Fix failing calendar tests