Fixing last unit test