Fix specs and expectations for URL changes.