Fixing the failing test cases