Moving over to mock service host to simplify testing