Merge "Add time zone version tests"