Fixing failing tests on the azure implementation