Fleshed out proxy builder and unit test for happy path