LinkMember refactor for not working cases and add tests