FIxed failing unit tests