New code refactor for CalendarCalculatorServiceIntegTest