Fixed up the unit tests.