Make more of the tests data-driven