Fix format typo for ISO 8601 date conversion

See: dd00409e85e2f3b17edc43cbd347f2d5be6dda76 (typo on my part when cherry-picking that commit).
Update test assertions for date format
Merge branch '2.0'