Starting to fix/update the tests
Qa: Refactor how user session is passed
QA