Update cost control tests and xfail with bug 859285
Merge pull request #627 from zacc/xfail_cc_tests_859285

Update cost control tests and xfail with bug 859285