DateType.add(), subtract() not preserving calendar;
fix unit tests
fix unit tests