More cleanup on tests.