Fix exchange unit tests re json/simplejson
Fix endpoint unit tests