cleanup of scripts to accomodate multiple vm tests