SOC-4403 | removes the session.save and fixed UTs failed.