Apply DRY & layout link tests