Add unit test for test add/remove service and host