minor cleanups of template test iterable code
minor cleanups of template test iterable code

SophistSolutions/Stroika,SophistSolutions/Stroika,SophistSolutions/Stroika,SophistSolutions/Stroika,SophistSolutions/Stroika