cleanup, and marionette test fixes