More cleanup.
Expand query component tests.
Rename.
Expand query component tests.