fixed url path causing broken tests
merge with upstream and ignore upstream changes
fix specs to use a string of a json hash, not a raw hash object