I have fixed the failures also attached interdiff for same. please review