Added test support for links