Add session controller
Decouple some rspec tests