Merge pull request #232 from bryan-m-hughes/timob-13685

Timob 13685 Fixed unit test regressions
Merge branch 'master' into timob-12070