Fixed some, not all, unit tests.