Update cost control tests and xfail with bug 859285