Reorganize and clean up test machinery.