do parse json, fix tests
Merge branch 'master' into forked_stuff