Improve URL scheme and current mocks.