Fix tests ready for Session tests
Implement & test core Session functionality