[vcloud_director|tests] Fix some edge cases.