Added Graceful Shutdown of AirDispatch Servers
- Refactored Test 1