Also added testcases to handle the combination with strict recurrence
well.

(cherry picked from commit 4c7e5c54)