Fixing some unit tests