individual sessions
fix the test suite