Rewriting tests to be data provider based