Fixed test failures with avoscloud