Rewrote some tests.