Fix some broken unit tests.