Filter on link
Fix randomly failing tests