Updated tests and sessions-manager