Point to new certs.
Added tests
Rename vars