Eliminate race conditions and fix tests#3

Open

vrurg wants to merge 2 commits intocroservices:mainfrom vrurg:eliminate-races

+8

Commits on Mar 6, 2021

Prevent exception caused by $service.stop
vrurg
committed

Commits on Mar 7, 2021

Fix race conditions
vrurg
committed