Updating builder and tests to include proxy