Adds Link-/Unlink-Annotations and extend the tests accordingly