Fixing test failures.
@bug W-2033544@
@rev ronak.shah@
@rev mkohanfars@

code revew changes
Merging origin/ctatlah/master-pending-testFailureFixes into master