calendar tests fix II
calendar tests fix III