The simplest, most trivial queries work now. Add tests for them too.