ensure we wait for server deletes

we've got another place where ci has been flakey because we aren't
waiting for server deletes, fix that.

At the same time remove a sleep 60 which isn't needed any more.

This class is also ripe to try to move server setup into class setup
instead of test setup.

Change-Id: Ic7ea69c88804e380015faf50e4172d29611a1e8f
Merge "ensure we wait for server deletes"