Renamed  every DataService instance;
Renamed DataServiceTests