Tests and fix for first session.