Fixes of unit tests