Fix mocking issues causing test failures
Don't escape commas in URLs