Fix directories and such for multi-vm tests, still didn't have it quite right