Fixed up some broken unit tests.