Stabilized the implementation and tested http data provider