updated tests & linkBuilder