Merge "Revert "Add tests for wait_for_server_status""