Better inject URLs, and make tests pass