Calendar modularization again with unit test fixes