Revamps most of our tests.