Begin and end marionette tests a bit more gracefully