Fix race conditions in unit tests
Fix race conditions in unit tests

control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced