KIJIMR-141. Fix more tests.

Signed-off-by: Lee Sheng <lsheng@wibidata.com>