Add pass/fail counters, add cleanup code