Backport icalendar-tests fixes from trunk