[vcloud_director] Minor test cleanups.