Merge "Modify Tests to make SessionManager final for tests" into main