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