Tests cleanup, links started