fix unit-tests