unit-test fixes
unit-test improvement