[#878] Tests improvements per code review.