Clean up duplicated test components, & add link test