[fix bug 879762] Commenting system for the swag/budget automation.
* Replace fudge with mock in some failing tests.