added dynamic proxies
changed mock to user dynamic proxy
cleanup