renamed Proxy to Recorder
refactoring test
refactoring test
fixed a bugged test
refactoring test