Correct Uri without account - passing two new tests