fix Unit tests