- Fix queries so they can actually be executed.
- add cross test for deserializing plans