Template adjustments to support new test links