ProxyTest still failing, commit to save bevore refactorings
refactorings done, ProxyTest still failing