Fixes bug in VM.z2i
Tests and bug bixes for two2three