Fixing some unit tests

-