fix #81
fix #82
Merge pull request #84 from msimonin/fix82AddVmsList

fix #81
fix tests issue.

M
Merge pull request #85 from msimonin/fix82AddVmsList

fix tests issue.