We should see if these can be moved to `AbstractTestQueries` so that they work for the distributed tests. It's common to see problems with things like serialization that don't show up in the local tests.