Updated template tests