* addressing the reviews * addressing the review * refactored test code * updated expected failures file