Refactor spec & add link tests