CIMI - Tests - Extended machine scenarios part 2 and plan corrections

TrackedAt: http://tracker.deltacloud.org/patch/ad87387648d328a70c3952ca78787245657caf1f