Fixed bug with approval again, added more links, added tests