Unfactor the macros...
Some renaming
Added fakeRequest "backdoor"