Merge "Add unit test for VCALENDAR generation from TimeZone"