improved test proxy