Yeah -- I may be overthnking the template test. Will just leave that one as is for now and add the new one for 500.