[Ravi] fixed failing tests