fixed calendar test
Merge remote-tracking branch 'origin/lonelybranch' into lonelybranch