Rewrote the test framework.