vm mocks updated
tests fixed