JSON node tests

Sorry for the double commits, I got in a bit of a mess with git and don't know how to get out of it.