Fixed Calendar bug, progress on override test.