Corrections to loop iterators, properly cleaning up the tests,
starting to use vhd-name to specify a path to local vhd.