Deleted TestServer, integrated the server with the main app