Spruced up all the certificate tests.
Merge branch 'cert-fails' into develop