I'll have it updated shortly. I'll do the test -> data provider refactor in a different PR