Add more data-driven tests.

Dont even ask who failed to pass these elsewhere...