updated tests for VM to new structure