Merge pull request #269 from arstrube/issue214_6.7

Issue214 6.7
Step 7: Only use interfaces in MockSupport.h

...and implementation in MockSupport.cpp
Apply NVI idiom where already used - 1
Apply NVI idiom where already used - 2
Apply NVI idiom where already used - 3