Fixed some broken unit tests.