fixes of unit tests