Add more specs for sessions, cleaned up sessions and some other parts of company