Removed left overs from validation rewrite.
Reworked tests to bypass OJMoq features that seem broken with acorn.