Minor URI pattern change, and more test refactoring