Split tests into separate files
Synthesize all TODO's and fix simplest calendar cases