[minor] Cleanup.
Add a few more tests.

Including three that fail due to `SELECT foo{*} from foo` naming the
field `foo` rather than `0`.