fix  unit tests