Cleanup session controller and add spec