Merge "Remove service before adding test mock." into tm-dev