Add changes requested in the review
Fix failing test