Corrected most of the calls that fails and all the tests passes as well