Remove more dead code from test.