added testing vm
Merge branch 'master' into mac