Fixed some problems with unit tests.