Failing unit test fixed