#1581 | Parameterized the test provider