Bug 993949 -[Cost Control] Follow up to add unit test for bug 986358