Fixed failing unit test