Minor template fixes, testing links all work