fixed some broken unit tests.