Fix Marionette tests