fix some unit-tests