Remove a bunch of noise from the test suite