Revert changs to Flush point tests made as part of 4ad3e9

This should resolve timing issues that are currently being seen.
Update message from DI exception
React to DI changes part 2
[Partial fix for #1372]Added SimpleTypesExcludeFilter to exlcude validation on simple types and also added tests to cover scenarios.