Git accident.. revert last commit
Revert "Simplify table-driven test."

This reverts commit 2555b882078c3513ef2983cffe8d3514de6bdfc1.