fixing failing Unit Tests