[DataProviders] Some work on data providers

+Fixed tests
[DataProviders] Factory