fixing failing unit tests