More work on Test Proxy feature