More fixes for JSON testing