Fixed up some of the unit tests.