Add testing, adjust template link placement