Add SessionTests
Re-factor SessionTests to work with v3
Merge branch 'v3-fixes' into v3