unit-tests changes