adding unit tests
Merge branch 'bmbouter-1096311' into mhrivnak-fix-babysit-test
Merge remote-tracking branch 'origin/mhrivnak-fix-babysit-test' into bmbouter-1096311