updated templates to match new test matrices