Add more data-driven tests.
Merge pull request #3601

c32a486 Add more data-driven tests. (Matt Corallo)