Fix up some tests around json