Asif & Aparna | Fixed Broken tests