tests fixed
vm mocks updated