Remove more old crufty testing infrastructure