Updated calendar tests