TEZ-843. Fix failing unit test post TEZ-756. (sseth)