fix unit-tests
update unit-tests