Refactor tests to use @dataProvider in reference to Issue #1