Test failure fixes
Unit test fixes
Fix to call modified protected property
Merge pull request #583 from NileemaJadhav/HR-377

Test failure fixes