Updated although still with failing unit test