Fix some unit tests that are failing in mono