Holly made another round of test case changes, mostly to help test cases run more smoothly.