[vcloud_director|tests] Fixes and cleanup

As previously but without the unintended irony.