Fix tests, exclude day-of-week and day-of-month.
Fix tests again.