updating session controller, fixing tests