diff --git a/README.md b/README.md
index 0edc84a..95d60c1 100644
--- a/README.md
+++ b/README.md
@@ -188,19 +188,17 @@ TC16|Panorama Template Remove unbound Certificate|/config/devices/entry[@name='l
TC17|Panorama Template Replace bound Certificate|/config/devices/entry[@name='localhost.localdomain']/template/entry[@name='CertificatesTemplate']/config/shared|**Alias**:
LongNameTest
**Overwrite**:
true|Certificate is replaced, binding updated in shared location for template|True|![](images/TC17.gif)
TC18|Panorama Template Remove bound Certificate|/config/devices/entry[@name='localhost.localdomain']/template/entry[@name='CertificatesTemplate']/config/shared|**Alias**:
LongNameTest|Certificate is not removed because it is bound|True|![](images/TC18.gif)
TC19|Panorama Template Shared Inventory|/config/devices/entry[@name='localhost.localdomain']/template/entry[@name='CertificatesTemplate']/config/shared|N/A|Certificates are inventoried from this location|True|![](images/TC19.gif)
-TC19|Panorama Template Virtual System Inventory|/config/devices/entry/template/entry[@name='CertificatesTemplate']/config/devices/entry/vsys/entry[@name='vsys2']|N/A|Certificates are inventoried from this template vsys location|True|![](images/TC20.gif)
-
-TC15|Panorama Template Invalid **Template** in Store Path|/config
/devices
/entry[@name=
'localhost.localdomain']
/template
/entry[@name=
'CertificatesTemplate1']
/config/
shared|N/A|Errors out saying template does not exist|True|![](images/TC15.gif)
-TC16|Panorama Template Invalid Store Path|/config
/devices[@name=
'CertificatesTemplate1']
/config
/shared|N/A|Errors out saying invalid path|True|![](images/TC16.gif)
-TC17|Panorama Template Inventory|/config
/devices
/entry
[@name=
'localhost.localdomain']
/template
/entry[@name=
'CertificatesTemplate']
/config
/
shared|N/A|Job Completes with Inventory of certificates from Panorama Template.|True|![](images/TC17.gif)
-TC18|Panorama Enroll No Bindings|/config/panorama|**Alias**:
TC18|Cert and Chain Installed on Panorama|True|![](images/TC18.gif)
-TC19|Panorama Remove No Bindings|/config/panorama|**Alias**:
TC19|Cert Removed From Panorama|True|![](images/TC19.gif)
-TC20|Panorama Add Bindings|/config/panorama|**Alias**:
TC20
**TLS Min Version**:
tls1-0
**TLS Max Version**:
max
**TLS Profile Name**:
PanLevelBindings|Cert added to Panorama and Bound to TLS Profile|True|![](images/TC20.gif)
-TC21|Panorama Remove Bound Certificate|/config/panorama|N/A|Will not Remove Bound certificate Error Occurs|True|![](images/TC21.gif)
-TC22|Panorama One Click Renew Bound Cert|/config/panorama|N/A|Renews cert create with new name bind. Leave old one around.|True|![](images/TC22.gif)
-TC23|Panorama Configure Renew Bound Cert|/config/panorama|N/A|Renews cert create with new name bind. Leave old one around.|True|![](images/TC23.gif)
-TC24|Panorama Invalid Store Path|/panorama|N/A|Errors out with Invalid path.|True|![](images/TC24.gif)
-TC25|Panorama Inventory|/config/panorama|N/A|Job Completes with Inventory of certificates from Panorama.|True|![](images/TC25.gif)
-
+TC20|Panorama Template Virtual System Inventory|/config/devices/entry/template/entry[@name='CertificatesTemplate']/config/devices/entry/vsys/entry[@name='vsys2']|N/A|Certificates are inventoried from this template vsys location|True|![](images/TC20.gif)
+TC21|Panorama Template Virtual System Enroll Certificate|/config/devices/entry/template/entry[@name='CertificatesTemplate']/config/devices/entry/vsys/entry[@name='vsys2']|**Alias**:
www.vsys2enroll.com|Certificate is enrolled to vsys2 location for template|True|![](images/TC21.gif)
+TC22|Panorama Template Virtual System Replace unbound Certificate|/config/devices/entry/template/entry[@name='CertificatesTemplate']/config/devices/entry/vsys/entry[@name='vsys2']|**Alias**:
www.vsys2enroll.com|Certificate is replaced in vsys2 location for template|True|![](images/TC22.gif)
+TC23|Panorama Template Virtual System Remove unbound Certificate|/config/devices/entry/template/entry[@name='CertificatesTemplate']/config/devices/entry/vsys/entry[@name='vsys2']|**Alias**:
www.vsys2enroll.com|Certificate is removed in vsys2 location for template|True|![](images/TC23.gif)
+TC24|Panorama Template Virtual System Renew bound Certificate|/config/devices/entry/template/entry[@name='CertificatesTemplate']/config/devices/entry/vsys/entry[@name='vsys2']|**Alias**:
www.vsys2enroll.com|Certificate is renewed, binding updated in vsys2 location for template|True|![](images/TC24.gif)
+TC25|Panorama Level Inventory|/config/panorama|N/A|Certificates are inventoried from this location|True|![](images/TC25.gif)
+TC26|Panorama Level Enroll Cert and Chain|/config/panorama|**Alias**:
www.panlevelcertandchain.com|Panorama Level Install Cert and Chain|True|![](images/TC26.gif)
+TC27|Panorama Level Enroll Cert overwrite warning|/config/panorama|**Alias**:
www.panlevelcertandchain.com
**Overwrite**:
false|Cert is not installed warned Overwrite is needed|True|![](images/TC27.gif)
+TC28|Panorama Level Replace Cert|/config/panorama|**Alias**:
www.panlevelcertandchain.com
**Overwrite**:
true|Cert is replaced because Overwrite was used|True|![](images/TC28.gif)
+TC29|Panorama Level Remove unbound Cert|/config/panorama|N/A|Cert is removed because not bound|True|![](images/TC28.gif)
+TC30|Panorama Level Replace bound Cert|/config/panorama|**Alias**:
PanoramaNoPK
**Overwrite**:
true|Cert is replaced, binding updated|True|![](images/TC30.gif)
+TC31|Firewall previous version cert store settings|/config/shared|**Alias**:
www.extraparams.com
**Overwrite**:
false|Cert is still installed because it ignores extra params|True|![](images/TC31.gif)