Fix the promise but also clean up tests of KVM, as they fail since some time (and most possibly were hidden by original trouble with the promise).