Bug 1953: adding tests and 2 corrections for C4::Calendar