[PR] Session handling update + RSpec config improvements