Merge: nitc: fix some broken case in equal_test