Fixing calendar tests