Fix marionette tests