Simplify the test machinery.