Fixed some unit tests.