Progress with tests
Cleanup, and improve session data