Better cleanup surrounding tests.