Updated linkify and test