Revert "Revert "Added missing types to CMFDiffTool configuration""

Seems like this commit wasn't responsible for the test failures.

This reverts commit 9df91de6c00260cdd566d80e904f5133032dca00.