Implemented a bit better the treatRequest
Finalized the tests