fixed some unit tests.