Updated Mock classes to use new Macros in UnitTest11