Add data provider and tests

Add data provider and tests