Fixed failing Unit tests