Fixed failing unit testing