Incorporating PR comments and adding Link generation tests