Rename directory to "connection" in tests, too.
While at it, bring test subdirs into a logical order. First test basics, then parts that use them.