Fixing the failed tests.(DHH-545)