restructure tests against new format, fixes issues
restructure tests against new format, fixes issues

gds-operations/vcloud-net_launcher,gds-operations/vcloud-net_launcher,gds-operations/vcloud-net_launcher