Get some JSON tests passing
Fix one more Json test

Two to go!