Delete server after it errors out.

Change-Id: I3e3e437f64395b291308aabe53c173e44b28229c
Working on fixing broken unit tests.

Change-Id: Iadeda611e898e75672d3ce0854345e757a90e6e0