Merge "Check server terminations on "delete server" tests"