Change links and clean up tests