Refactored JSON tests somewhat.
Refactored JSON tests somewhat.

aaronsw/watchdog,MjAbuz/watchdog,ferranti/watchdog,aaronsw/watchdog,MjAbuz/watchdog,MjAbuz/watchdog,ferranti/watchdog,ferranti/watchdog,ferranti/watchdog,aaronsw/watchdog,MjAbuz/watchdog