refactorings done, ProxyTest still failing
Mapping using Dynamic Proxy made running