Sessions refactor
Merged from master
Improve sessions tests
Merge branch 'master' into sessions_test_refactor
Improve refactor
Improve tests
Improve sessions tests refactor
Merge branch 'master' into sessions_test_refactor