More post-test cleanups

As SurgePredictions seems to be interfering with each other across
different test suites :S