GPII-784: Updated the Proxy stuff to work again, incl. tests