Fixed last failed unit test