Mostly this commit marks test functions as private if their not used
outside of their ns

Previously when java.jdbc renamed a project column (i.e. NAME to
NAME_2) to disambiguate them, we would discard previous information on
that NAME column and reconstruct it based on the data that comes back
from the query. This changes that behavior to update the existing
column data to the new name. When we do not have metadata on that
column it will use the existing behavior to infer that.

This commit also adds some tests for remapping which uncovered this
bug.

This commit splits the what was the expand-resolve middleware separate
expand and resolve middlewares. This also splits the source table
resolving to a separate middleware. This split sets up being able to
add an FK field after query expansion to be resolved normally as it
goes through the pipeline.