Rewrote unit tests.