Fixed #23768 -- Rewrote template tests as unit tests