Oops -- just deleted my comment by accident. It went something like this:
May be overthinking the template test and will leave as is for now. Will add 500 test.