Merge "Added a test for stop and start a server"