Fix of unit tests