vmm fixes + more robust test