Add (and test) more links