Fixed gas check for vm test
Merge branch 'develop' into poc8