fix the bugs for unit-test