FIXED THE FAILURES IN TEST CASEs