Fixed failing unit tests