Fix restarting of service after redeployment
Consolidate test cases