Refactor spec (Session)