Update cost control tests and xfail with bug 859285

Some test changes due to the marionette events,

coinciding with a failure in the app itself, bug logged.