Change the rest of the unit tests, to properly mock  services