Fix third links and test it