a few unit-test has been fixed