Finished about 2/3 of the unit tests.