Prep for unit tests
Changes to calendar and unit test