Replace fudge with mock.
Merge pull request #680 from johngian/replace-fudge

Replace fudge with mock.