Fixed up unit tests.