Issue 218: Fixed failing unit test