Add corrections from review and update tests