Add tests to allow  roundtripping all queries thru JSON serialization.