Don't use Calendar anymore and move some tests in the appropriate class.