Improve sessions tests refactor