Index: /trunk/src/VBox/ValidationKit/tests/api/tdMoveVM1.py
===================================================================
--- /trunk/src/VBox/ValidationKit/tests/api/tdMoveVM1.py	(revision 71553)
+++ /trunk/src/VBox/ValidationKit/tests/api/tdMoveVM1.py	(revision 71554)
@@ -275,4 +275,6 @@
         return self.oTstDrv.asRsrcs
 
+    # All disks attached to VM are located inside the VM's folder.
+    # There are no any snapshots and logs.
     def __testScenario_2(self, oSession, oMachine, sNewLoc, sOldLoc):
 
@@ -308,4 +310,5 @@
         return fRc
 
+    # There are snapshots
     def __testScenario_3(self, oSession, oMachine, sNewLoc):
 
@@ -348,4 +351,8 @@
         return fRc
 
+    # There are one or more save state files in the snapshots folder
+    # and some files in the logs folder.
+    # Here we run VM, next stop it in the "save" state.
+    # And next move VM
     def __testScenario_4(self, oMachine, sNewLoc):
 
@@ -403,4 +410,6 @@
         return fRc
 
+    # There is an ISO image (.iso) attached to the VM.
+    # Prerequisites - there is IDE Controller and there are no any images attached to it.
     def __testScenario_5(self, oMachine, sNewLoc, sOldLoc):
 
@@ -462,4 +471,6 @@
         return fRc
 
+    # There is a floppy image (.img) attached to the VM.
+    # Prerequisites - there is Floppy Controller and there are no any images attached to it.
     def __testScenario_6(self, oMachine, sNewLoc, sOldLoc):
 
@@ -482,5 +493,5 @@
         shutil.copy(sFloppyLoc, sOldLoc)
 
-        # attach floppy image
+        #attach floppy image
         if fRc is True:
             #set actual floppy location
@@ -577,7 +588,7 @@
 
 ############# 1 case. ##########################################################################################
-            #   All disks attached to VM are located outside the VM's folder.
-            #   There are no any snapshots and logs.
-            #   In this case only VM setting file should be moved (.vbox file)
+            # All disks attached to VM are located outside the VM's folder.
+            # There are no any snapshots and logs.
+            # In this case only VM setting file should be moved (.vbox file)
             for s in self.asImagesNames:
                 reporter.log('"%s"' % (s,))
@@ -603,6 +614,6 @@
 
 ############# 2 case. ##########################################################################################
-            #   All disks attached to VM are located inside the VM's folder.
-            #   There are no any snapshots and logs.
+            # All disks attached to VM are located inside the VM's folder.
+            # There are no any snapshots and logs.
             sOldLoc = sNewLoc + oMachine.name + os.sep
             sNewLoc = os.path.join(sOrigLoc, 'moveFolder_2d_scenario')
@@ -614,5 +625,5 @@
 
 ############# 3 case. ##########################################################################################
-            #   There are snapshots.
+            # There are snapshots.
             sOldLoc = sNewLoc + oMachine.name + os.sep
             sNewLoc = os.path.join(sOrigLoc, 'moveFolder_3d_scenario')
@@ -624,8 +635,8 @@
 
 ############# 4 case. ##########################################################################################
-            #   There are one or more save state files in the snapshots folder
-            #   and some files in the logs folder.
-            #   Here we run VM, next stop it in the "save" state.
-            #   And next move VM
+            # There are one or more save state files in the snapshots folder
+            # and some files in the logs folder.
+            # Here we run VM, next stop it in the "save" state.
+            # And next move VM
 
             sOldLoc = sNewLoc + oMachine.name + os.sep
@@ -645,8 +656,8 @@
 
 ############## 5 case. ##########################################################################################
-            #There is an ISO image (.iso) attached to the VM.
-            #Prerequisites - there is IDE Controller and there are no any images attached to it.
-
-            sOldLoc = sNewLoc + os.sep + oMachine.name + os.sep
+            # There is an ISO image (.iso) attached to the VM.
+            # Prerequisites - there is IDE Controller and there are no any images attached to it.
+
+            sOldLoc = sNewLoc + os.sep + oMachine.name
             sNewLoc = os.path.join(sOrigLoc, 'moveFolder_5th_scenario')
             os.mkdir(sNewLoc, 0o775)
@@ -656,8 +667,8 @@
 
 ############# 6 case. ##########################################################################################
-            #There is a floppy image (.img) attached to the VM.
-            #Prerequisites - there is Floppy Controller and there are no any images attached to it.
-
-            sOldLoc = sNewLoc + os.sep + oMachine.name + os.sep
+            # There is a floppy image (.img) attached to the VM.
+            # Prerequisites - there is Floppy Controller and there are no any images attached to it.
+
+            sOldLoc = sNewLoc + os.sep + oMachine.name
             sNewLoc = os.path.join(sOrigLoc, 'moveFolder_6th_scenario')
             os.mkdir(sNewLoc, 0o775)