Fixed the failed tests after we changed the structure of session

fning