The VM revert on test failure was added to 2.1 but it was only disabled in 2.2.
Added tests from develop. The test results need to be modified for 2.0.