Initial pass at instrumenting cert.py and harness.py