Fix failing tests on .net