* Removed useless test of session
* Better testing