Test fixes and removed old code. Added VM gas fees