Fixing failing unit tests