Marionette tests refactor