KIJIMR-141. Fix more tests.