Remove System.out.println from unit test
Add unit tests for the proxy feature