Rename most builders to factories

Rename most builders to factories
Rename the test adapter to adapter since it uses the test-jar
Make use of the connection proxy