Add links and new tests