Merge pull request #498 from hhovsepy/master

skip test if machine is virtual
Merge pull request #500 from hhovsepy/master

removed failing test class
Merge pull request #501 from hhovsepy/master

fixed failing tests
Merge pull request #502 from hhovsepy/master

fixed failing test
Merge pull request #503 from hhovsepy/master

ty
added more scenarios for upgrade