Merge "Refactor mock Functors into a common TestUtils class."