[vcloud_director|tests] Fix some edge cases.
Merge pull request #2207 from nosborn/vcloud_director_test_fixes

[vcloud_director|tests] Fix some edge cases.