Added tests for new proxy stuff