Merge "add server delete/unpause tests"