Fixing some unit tests.