I'd be happy to redo the entire test suite as data providers. I was following existing code as an example.