Refactored everything.

Timing tests are now self-contained. Test methods run in rounds rather than all at once.