Got the first unit test for ProxyBuilder to pass.
Refactorings and unit test additions.